From 2fa693feb02dbf85431a92ba6a560050fafc9d95 Mon Sep 17 00:00:00 2001
From: SeeLook <seelook@gmail.com>
Date: Fri, 20 Nov 2020 23:59:08 +0100
Subject: [PATCH] [MacOs] Use simpler solution for freetype
---
packaging/mac/qt.conf | 2 +-
src/main.cpp | 22 +---------------------
2 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/packaging/mac/qt.conf b/packaging/mac/qt.conf
index 0cd5f6f78..fa0d90844 100755
--- a/packaging/mac/qt.conf
+++ b/packaging/mac/qt.conf
@@ -1,5 +1,5 @@
[Platforms]
-cocoa = fontengine=freetype
+CocoaArguments = fontengine=freetype
[Paths]
Plugins = PlugIns
diff --git a/src/main.cpp b/src/main.cpp
index b062ce0fb..ab77b7387 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -116,28 +116,8 @@ int main(int argc, char *argv[])
nooObj->setResetConfig(false);
#endif
-#if defined (Q_OS_MAC)
- // HACK: Add command line arguments that forces using freetype font engine
- // because qt.conf doesn't work
- int new_argc = argc + 2;
- std::vector<std::unique_ptr<char>> new_argv_aux(new_argc);
- for (int ii = 0; ii < argc; ++ii) {
- new_argv_aux[ii].reset(new char[strlen(argv[ii]) + 1]);
- strcpy(new_argv_aux[ii].get(), argv[ii]);
- }
- new_argv_aux[argc].reset(new char[strlen("-platform") + 1]);
- strcpy(new_argv_aux[argc].get(), "-platform");
- new_argv_aux[argc + 1].reset(new char[strlen("cocoa:fontengine=freetype") + 1]);
- strcpy(new_argv_aux[argc + 1].get(), "cocoa:fontengine=freetype");
-
- std::vector<char*> new_argv(new_argv_aux.size());
- for (size_t ii = 0; ii < new_argv_aux.size(); ++ii)
- new_argv[ii] = new_argv_aux[ii].get();
-
- a = new QApplication(new_argc, new_argv.data());
-#else
a = new QApplication(argc, argv);
-#endif
+
Tmtr::init(a);
gl = new Tglobals();
--
GitLab