Merge branch 'Plasma/5.15'

ksmserver/startup.cpp

@@ -276,6 +276,7 @@ void RestoreSessionJob::start()
         return;
     }
 
+    m_ksmserver->restoreLegacySession(KSharedConfig::openConfig().data());
     m_ksmserver->lastAppStarted = 0;
     m_ksmserver->lastIdStarted.clear();
     m_ksmserver->state = KSMServer::Restoring;

kuiserver/main.cpp

@@ -30,6 +30,7 @@
 #include <kworkspace.h>
 
 #include <QCommandLineParser>
+#include <QSessionManager>
 
 Q_LOGGING_CATEGORY(KUISERVER, "kuiserver", QtInfoMsg)
 
@@ -41,6 +42,12 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
     app.setApplicationVersion(QStringLiteral("2.0"));
     app.setOrganizationDomain(QStringLiteral("kde.org"));
 
+    auto disableSessionManagement = [](QSessionManager &sm) {
+        sm.setRestartHint(QSessionManager::RestartNever);
+    };
+    QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement);
+    QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement);
+
     QCommandLineParser parser;
     parser.addHelpOption();
     parser.addVersionOption();