diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-20 12:18:23 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-20 12:18:23 +0100 |
| commit | c83c08d84fe00a4033d7ba61fd95c150f643736d (patch) | |
| tree | 088927e1b2e9d67300253c29ba73be6be6d8ae31 /src/gui/kernel/qwindow.cpp | |
| parent | 1e446fc99167a992b1a8342168b6254f43b097fe (diff) | |
| parent | 72ea7900858a31c1c6b93e6fed9f2f4dc30291e4 (diff) | |
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
Diffstat (limited to 'src/gui/kernel/qwindow.cpp')
| -rw-r--r-- | src/gui/kernel/qwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index a6223987c2..4a40dd7e29 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -1662,7 +1662,7 @@ void QWindow::show() bool isPopup = d_func()->windowFlags & Qt::Popup & ~Qt::Window; if (!isPopup && qApp->styleHints()->showIsFullScreen()) showFullScreen(); - else if (!isPopup && QGuiApplicationPrivate::platformIntegration()->styleHint(QPlatformIntegration::ShowIsMaximized).toBool()) + else if (!isPopup && !(d_func()->windowFlags & Qt::Dialog & ~Qt::Window) && QGuiApplicationPrivate::platformIntegration()->styleHint(QPlatformIntegration::ShowIsMaximized).toBool()) showMaximized(); else showNormal(); |