diff options
author | Liang Qi <liang.qi@qt.io> | 2018-02-12 13:07:06 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-02-12 13:07:06 +0100 |
commit | 675c150a28ae9f1ca5f4960caeed522da534f6fc (patch) | |
tree | f29de6db23985893ed21c8caaf2fbc1e10aa063b /src/quicktemplates2/qquickpopup.cpp | |
parent | e052684db6e0814a6a3397eb21e3ce9f922563da (diff) | |
parent | 95b4996a04989aa26c8fba8aaa90b76b7166c2c1 (diff) |
Merge remote-tracking branch 'origin/5.10' into 5.11
Change-Id: I2934d3f51fea9626fd2d2512786eb297d9f7fe6c
Diffstat (limited to 'src/quicktemplates2/qquickpopup.cpp')
-rw-r--r-- | src/quicktemplates2/qquickpopup.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp index 1a4c90a4..207a886b 100644 --- a/src/quicktemplates2/qquickpopup.cpp +++ b/src/quicktemplates2/qquickpopup.cpp @@ -450,12 +450,11 @@ bool QQuickPopupPrivate::prepareExitTransition() return false; if (transitionState != ExitTransition) { - if (focus) { - // The setFocus(false) call below removes any active focus before we're - // able to check it in finalizeExitTransition. - hadActiveFocusBeforeExitTransition = popupItem->hasActiveFocus(); + // The setFocus(false) call below removes any active focus before we're + // able to check it in finalizeExitTransition. + hadActiveFocusBeforeExitTransition = popupItem->hasActiveFocus(); + if (focus) popupItem->setFocus(false); - } transitionState = ExitTransition; hideOverlay(); emit q->aboutToHide(); |