X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=6847371d86045cdc4da9026b078c658566cc82a2;hb=d367542ce54ed86fd3c8dbdbbf8210fc9a19a882;hp=9d75da4ec12263cfe48b2204b650c77caaf36b35;hpb=d32f2fcafe3d3925cd64e332e0d02261a134af21;p=quassel.git

diff --git a/src/common/main.cpp b/src/common/main.cpp
index 9d75da4e..6847371d 100644
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -49,6 +49,7 @@
 #  include "kcmdlinewrapper.h"
 #elif defined HAVE_KF5
 #  include <KCoreAddons/KAboutData>
+#  include <KCoreAddons/Kdelibs4ConfigMigrator>
 #  include "qt5cliparser.h"
 #elif defined HAVE_QT5
 #  include "qt5cliparser.h"
@@ -102,6 +103,13 @@ 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
@@ -190,9 +198,6 @@ int main(int argc, char **argv)
     }
 #endif
 
-    if (!app.init())
-        return EXIT_FAILURE;
-
 #ifdef HAVE_KF5
     // FIXME: This should be done after loading the translation catalogue, but still in main()
     AboutData aboutData;
@@ -200,5 +205,8 @@ int main(int argc, char **argv)
     KAboutData::setApplicationData(aboutData.kAboutData());
 #endif
 
+    if (!app.init())
+        return EXIT_FAILURE;
+
     return app.exec();
 }