KItemListSmoothScroller: stop animation on property or targetobject change

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index d68cc3cc1e8f429d06f8235b8629598038b9999d..f811c4f06f4896d21d6cbb6ce403ff6b07fe6f43 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -27,10 +27,6 @@
 #include <KLocalizedString>
 #include <KWindowSystem>
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-#include <Kdelibs4ConfigMigrator>
-#endif
-
 #define HAVE_STYLE_MANAGER __has_include(<KStyleManager>)
 #if HAVE_STYLE_MANAGER
 #include <KStyleManager>
@@ -43,11 +39,7 @@
 #include <QSessionManager>
 
 #if HAVE_X11
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 #include <private/qtx11extras_p.h>
-#else
-#include <QX11Info>
-#endif
 #endif
 
 #ifndef Q_OS_WIN
@@ -81,13 +73,6 @@ int main(int argc, char **argv)
     KIconTheme::initTheme();
 #endif
 
-    /**
-     * enable high dpi support
-     */
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true);
-    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);
-#endif
     QApplication app(argc, argv);
     app.setWindowIcon(QIcon::fromTheme(QStringLiteral("system-file-manager"), app.windowIcon()));
 
@@ -106,15 +91,6 @@ int main(int argc, char **argv)
 #endif
 #endif
 
-    KCrash::initialize();
-
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    Kdelibs4ConfigMigrator migrate(QStringLiteral("dolphin"));
-    migrate.setConfigFiles(QStringList() << QStringLiteral("dolphinrc"));
-    migrate.setUiFiles(QStringList() << QStringLiteral("dolphinpart.rc") << QStringLiteral("dolphinui.rc"));
-    migrate.migrate();
-#endif
-
     KLocalizedString::setApplicationDomain(dolphinTranslationDomain);
 
     KAboutData aboutData(QStringLiteral("dolphin"),
@@ -152,6 +128,7 @@ int main(int argc, char **argv)
     aboutData.addAuthor(i18nc("@info:credit", "Michael Austin"), i18nc("@info:credit", "Documentation"), QStringLiteral("tuxedup@users.sourceforge.net"));
 
     KAboutData::setApplicationData(aboutData);
+    KCrash::initialize();
 
     QCommandLineParser parser;
     aboutData.setupCommandLine(&parser);
@@ -187,6 +164,9 @@ int main(int argc, char **argv)
     }
 
     if (parser.isSet(QStringLiteral("daemon"))) {
+        // Prevent KApplicationLauncherJob from cause the application to quit on job finish.
+        QCoreApplication::setQuitLockEnabled(false);
+
         // Disable session management for the daemonized version
         // See https://bugs.kde.org/show_bug.cgi?id=417219
         auto disableSessionManagement = [](QSessionManager &sm) {