diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-21 08:33:50 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-21 08:33:50 +0200 |
| commit | 4e26a18ede1775ae06bef7c272994e84510ebd9a (patch) | |
| tree | 0543dca51dc0b4f7a42c755235db4b00d2f080b4 /src/controls/qquickpopupwindow.cpp | |
| parent | 271d1efc13d4534830e37fd12fa6202981da723c (diff) | |
| parent | 3b093789b07c670e29d3275e26c4e7122db042ae (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I20f0f7a50b55907f4a6e574bdfe92bc9538879d6
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); |