X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=a9dafccd86f49f7c649c89eb87afdee5e9296adc;hb=8cece06596c290d69c1f32b7221c796437f5fabb;hp=6cbe4383569210175eedd1a41f60b3e454fec1fd;hpb=f94d946d6043005f419ac47944cdffdf37d95bdc;p=quassel.git diff --git a/src/common/main.cpp b/src/common/main.cpp index 6cbe4383..a9dafccd 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 @@ -200,6 +193,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;