diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-27 20:23:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-27 22:10:06 +0200 |
| commit | abe319c9cb811832bb4c9c95290564dfa7b3603a (patch) | |
| tree | e93b7e554b3cd497b86f0be3bd46450a91ea088e /src/controls/qquickpopupwindow.cpp | |
| parent | efdd81ce80b018b7b5779876e94f1b722af7fb9a (diff) | |
| parent | 69b3136bae16897492d27558c5909cd61a5e598e (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp
Change-Id: I0b6018fdac65a5385136e4c3561fba1c52ecd32e
Diffstat (limited to 'src/controls/qquickpopupwindow.cpp')
| -rw-r--r-- | src/controls/qquickpopupwindow.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/controls/qquickpopupwindow.cpp b/src/controls/qquickpopupwindow.cpp index 6d87ac477..9a6519ede 100644 --- a/src/controls/qquickpopupwindow.cpp +++ b/src/controls/qquickpopupwindow.cpp @@ -227,7 +227,8 @@ void QQuickPopupWindow1::hideEvent(QHideEvent *e) { if (QWindow *tp = !m_needsActivatedEvent ? transientParent() : 0) { m_needsActivatedEvent = true; - QWindowSystemInterface::handleWindowActivated(tp); + if (tp->isVisible()) + QWindowSystemInterface::handleWindowActivated(tp); } QQuickWindow::hideEvent(e); |