GIT_SILENT Sync po/docbooks with svn

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 703161b1e83726fee543778b74bcfef9f6373606..f811c4f06f4896d21d6cbb6ce403ff6b07fe6f43 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -91,8 +91,6 @@ int main(int argc, char **argv)
 #endif
 #endif
 
 #endif
 #endif
 

-    KCrash::initialize();
-

     KLocalizedString::setApplicationDomain(dolphinTranslationDomain);
 
     KAboutData aboutData(QStringLiteral("dolphin"),
     KLocalizedString::setApplicationDomain(dolphinTranslationDomain);
 
     KAboutData aboutData(QStringLiteral("dolphin"),


@@ -130,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);
     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);
 
     QCommandLineParser parser;
     aboutData.setupCommandLine(&parser);


@@ -165,6 +164,9 @@ int main(int argc, char **argv)
     }
 
     if (parser.isSet(QStringLiteral("daemon"))) {
     }
 
     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) {
         // Disable session management for the daemonized version
         // See https://bugs.kde.org/show_bug.cgi?id=417219
         auto disableSessionManagement = [](QSessionManager &sm) {