diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2016-11-29 16:43:42 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2016-11-30 11:24:43 +0000 |
| commit | 5b65698248325576faa03a2bb78d17349a33a194 (patch) | |
| tree | b5b5c9ba26fdac49ebb52c4408b1916e1d32aed9 /src/gui/kernel/qguiapplication.cpp | |
| parent | 1a0e690d50ff3b99a8a2e785c711b43f71de8459 (diff) | |
Close popups when blocked by modal dialog
Don't block the event that Qt depends on to close popups.
Task-number: QTBUG-57292
Change-Id: Ida1f928b81868f68a7b1e19cd0b83485d2a7232e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/gui/kernel/qguiapplication.cpp')
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 7beab72ab0..c189c5b068 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -1914,7 +1914,7 @@ void QGuiApplicationPrivate::processMouseEvent(QWindowSystemInterfacePrivate::Mo QMouseEvent ev(type, localPoint, localPoint, globalPoint, button, buttons, e->modifiers, e->source); ev.setTimestamp(e->timestamp); - if (window->d_func()->blockedByModalWindow) { + if (window->d_func()->blockedByModalWindow && !qApp->d_func()->popupActive()) { // a modal window is blocking this window, don't allow mouse events through return; } |