Merge branch 'Plasma/5.19'

startkde/plasma-session/main.cpp

@@ -24,10 +24,6 @@ int main(int argc, char **argv)
 {
     QCoreApplication app(argc, argv);
 
-    // This is needed with KJobs in a QCoreApplication as when they finish
-    // the internal QEventLoopLocker expires and our app exits
-    app.setQuitLockEnabled(false);
-
     new Startup(&app);
     app.exec();
 }

startkde/plasma-session/startup.cpp

@@ -151,6 +151,8 @@ class NotificationThread : public QThread
 {
     Q_OBJECT
     void run() override {
+        // Prevent application exit until the thread (and hence the sound) completes
+        QEventLoopLocker(this);
         // We cannot parent to the thread itself so let's create
         // a QObject on the stack and parent everythign to it
         QObject parent;