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

QmlDesigner: Fix evaluation dialog automatic close

Browse Source 
Fix Qt Enterprise Evaluation dialog being child of the QtDS splashscreen
resulting in the dialog getting closed together with the splashscreen
after its 15 seconds timer runs out.

Task-number: QDS-3258
Change-Id: Ied7a883efc925491dae65ac90227573cc93e1167
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Henning Gruendl
2020-12-07 15:08:53 +01:00
committed by Henning Gründl
parent 480edb9151
commit 2d9de4f706
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/icore.cpp
View File

@@ -637,7 +637,7 @@ QWidget *ICore::dialogParent()
QWidget *active = QApplication::activeModalWidget();
if (!active)
active = QApplication::activeWindow();
if (!active)
if (!active || (active && active->windowFlags().testFlag(Qt::SplashScreen)))
active = m_mainwindow;
return active;
}