From 54c4b81370d0d930a95d2277bcc9cb35b67c4706 Mon Sep 17 00:00:00 2001 From: James Turner Date: Sat, 21 May 2016 10:36:43 +0100 Subject: [PATCH] Testing if this change broke Mac deployment. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Hopefully it didn’t but the time-frame is correct and it’s just about the only code that happens before QApplication is created. --- src/GUI/QtLauncher.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/GUI/QtLauncher.cxx b/src/GUI/QtLauncher.cxx index 1cbcfb790..4791819d0 100644 --- a/src/GUI/QtLauncher.cxx +++ b/src/GUI/QtLauncher.cxx @@ -379,10 +379,11 @@ void initApp(int& argc, char** argv) // and may crash if it is freed // http://doc.qt.io/qt-5/qguiapplication.html#QGuiApplication +#if 0 QSettings::setDefaultFormat(QSettings::IniFormat); QSettings::setPath(QSettings::IniFormat, QSettings::UserScope, QString::fromStdString(globals->get_fg_home())); - +#endif QApplication* app = new QApplication(s_argc, argv); app->setOrganizationName("FlightGear"); app->setApplicationName("FlightGear"); -- 2.39.5