From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Thu, 23 Apr 2015 20:34:07 +0000 (+0200)
Subject: Move config file migration after QCoreApplication instantiation
X-Git-Tag: travis-deploy-test~567
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=b6eab225596b412e64df8f531e8bf0b790e0b663;hp=92490c7390f21d59a0df540c4bdcbb1de69e7e8e

Move config file migration after QCoreApplication instantiation

Seems like Kdelibs4ConfigMigrator accesses QCoreApplication::arguments()
now, leading to a warning on startup if QCA hasn't been instantiated yet.
---

diff --git a/src/common/main.cpp b/src/common/main.cpp
index b13d3eef..2bbe0cfa 100644
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -103,13 +103,6 @@ int main(int argc, char **argv)
 # endif
 #endif
 
-    // Migrate settings from KDE4 to KF5 if appropriate
-#ifdef HAVE_KF5
-    Kdelibs4ConfigMigrator migrator(QCoreApplication::applicationName());
-    migrator.setConfigFiles(QStringList() << "quasselrc" << "quassel.notifyrc");
-    migrator.migrate();
-#endif
-
     AbstractCliParser *cliParser;
 
 #ifdef HAVE_KDE4
@@ -198,6 +191,13 @@ int main(int argc, char **argv)
     }
 #endif
 
+// Migrate settings from KDE4 to KF5 if appropriate
+#ifdef HAVE_KF5
+    Kdelibs4ConfigMigrator migrator(QCoreApplication::applicationName());
+    migrator.setConfigFiles(QStringList() << "quasselrc" << "quassel.notifyrc");
+    migrator.migrate();
+#endif
+
 #ifdef HAVE_KF5
     // FIXME: This should be done after loading the translation catalogue, but still in main()
     AboutData aboutData;