From b6eab225596b412e64df8f531e8bf0b790e0b663 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Thu, 23 Apr 2015 22:34:07 +0200 Subject: [PATCH] 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. --- src/common/main.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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; -- 2.20.1