summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@digia.com>2012-09-21 12:12:01 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-21 22:04:00 +0200
commited8dec360c18e77ee60849e3a74fbd27501d2b4a (patch)
tree6a30b731b356b0ac7e38b795226ffa735934aa62 /src/gui/kernel
parentf4c1ae672652bc908ea1e0a8e353557b392940d7 (diff)
Fixed multiple modal windows from all blocking each other.
A modal window in front in the modal window list should never be blocked by a modal window further back in the list. This was taken care of in QGuiApplicationPrivate::isWindowBlocked(), we just need to make sure it gets called when a new modal window gets shown so that its blocked status is up to date. Task-number: QTBUG-27206 Change-Id: I590f1715e66067edb178081352636f34fe54a885 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qguiapplication.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index f59c7dcf4a..59be4fad4d 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -458,6 +458,8 @@ void QGuiApplicationPrivate::showModalWindow(QWindow *modal)
if (!window->d_func()->blockedByModalWindow)
updateBlockedStatus(window);
}
+
+ updateBlockedStatus(modal);
}
void QGuiApplicationPrivate::hideModalWindow(QWindow *window)