Merge branch 'Applications/16.12'

# Conflicts:
#	CMakeLists.txt

src/Application.cpp

@@ -74,7 +74,8 @@ void Application::populateCommandLineParser(QCommandLineParser *parser)
     parser->addOption(QCommandLineOption(QStringList() << QStringLiteral("background-mode"),
                                         i18nc("@info:shell", "Start Konsole in the background and bring to the front"
                                               " when Ctrl+Shift+F12 (by default) is pressed")));
-    parser->addOption(QCommandLineOption(QStringList() << QStringLiteral("separate"), i18n("Run in a separate process")));
+    // --nofork is a compatibility alias for separate
+    parser->addOption(QCommandLineOption(QStringList() << QStringLiteral("separate") << QStringLiteral("nofork"), i18n("Run in a separate process")));
     parser->addOption(QCommandLineOption(QStringList() << QStringLiteral("show-menubar"), i18nc("@info:shell", "Show the menubar, overriding the default setting")));
     parser->addOption(QCommandLineOption(QStringList() << QStringLiteral("hide-menubar"), i18nc("@info:shell", "Hide the menubar, overriding the default setting")));
     parser->addOption(QCommandLineOption(QStringList() << QStringLiteral("show-tabbar"), i18nc("@info:shell", "Show the tabbar, overriding the default setting")));

src/main.cpp

@@ -228,7 +228,10 @@ bool shouldUseNewProcess(int argc, char *argv[])
     }
 
     // if users have explictly requested starting a new process
-    if (arguments.contains(QStringLiteral("--separate"))) {
+    // Support --nofork to retain argument compatibility with older
+    // versions.
+    if (arguments.contains(QStringLiteral("--separate")) ||
+        arguments.contains(QStringLiteral("--nofork"))) {
         return true;
     }