feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source 
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>
This commit is contained in:
Burak Hancerli
2022-12-09 09:43:01 +01:00
committed by Tim Jenssen
parent d43ec85cb8
commit 2a506b4235
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/studiowelcome/studiowelcomeplugin.cpp
View File

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