diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2016-12-12 14:23:40 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2016-12-15 14:08:27 +0000 |
| commit | f9b1ec2d797b9a44dc983cddc15b5f00a0094cd1 (patch) | |
| tree | 430106436a1db036423b3e8959d3ed8460657c6f /src/gui | |
| parent | 3a9801d568e2f7d5a95ed4f5886a7f5062869456 (diff) | |
Touch fix for popups blocked by modal dialog
Don't block the event that Qt depends on to close popups.
This is the same fix as 5b65698248325576faa03a2bb78d17349a33a194,
but for touch this time.
Task-number: QTBUG-57292
Change-Id: I47bc19883c2e2b5dc9615c12dc6c198193c055cf
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'src/gui')
| -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 c189c5b068..98cdecc444 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -2595,7 +2595,7 @@ void QGuiApplicationPrivate::processTouchEvent(QWindowSystemInterfacePrivate::To break; } - if (w->d_func()->blockedByModalWindow) { + if (w->d_func()->blockedByModalWindow && !qApp->d_func()->popupActive()) { // a modal window is blocking this window, don't allow touch events through // QTBUG-37371 temporary fix; TODO: revisit in 5.4 when we have a forwarding solution |