QmlDesigner: fix QDS does not quit when closing it while Splash screen is open macOS

Setting modality prevents the window closing even the mainwindow
is being closed.

Task-number: QDS-8540
Change-Id: Ifa2b185c0548128b35ba680d2bc8bf8c856d7c37
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>

1 files changed, 6 insertions, 3 deletions

diff --git a/src/plugins/studiowelcome/studiowelcomeplugin.cpp b/src/plugins/studiowelcome/studiowelcomeplugin.cpp
index 818aeffb9d..f8a9b5c331 100644
--- a/src/plugins/studiowelcome/studiowelcomeplugin.cpp
+++ b/src/plugins/studiowelcome/studiowelcomeplugin.cpp
@@ -535,7 +535,6 @@ void StudioWelcomePlugin::extensionsInitialized()
 
                 s_viewWindow->setFlag(Qt::FramelessWindowHint);
 
-                s_viewWindow->setModality(Qt::ApplicationModal);
                 s_viewWindow->engine()->addImportPath("qrc:/studiofonts");
 #ifdef QT_DEBUG
                 s_viewWindow->engine()->addImportPath(QLatin1String(STUDIO_QML_PATH)
@@ -561,9 +560,13 @@ void StudioWelcomePlugin::extensionsInitialized()
                 s_viewWindow->setPosition((mainWindow->width() - s_viewWindow->width()) / 2,
                                           (mainWindow->height() - s_viewWindow->height()) / 2);
 
-                s_viewWindow->show();
-                s_viewWindow->raise();
+                Core::ICore::mainWindow()->setEnabled(false);
+                connect(s_viewWindow, &QObject::destroyed, []() {
+                    if (Core::ICore::mainWindow())
+                        Core::ICore::mainWindow()->setEnabled(true);
+                });
 
+                s_viewWindow->show();
                 s_viewWindow->requestActivate();
             } else {
                 s_viewWidget = new QQuickWidget(Core::ICore::dialogParent());