diff options
author | Liang Qi <liang.qi@qt.io> | 2018-02-09 09:18:56 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-02-09 09:18:56 +0100 |
commit | 95b4996a04989aa26c8fba8aaa90b76b7166c2c1 (patch) | |
tree | 67e08b6eafa60c96866b36c9330e0b526ba60726 /src/quicktemplates2/qquickpopup.cpp | |
parent | b3b079f1578527859aa1f5137ee8f2ec163923fb (diff) | |
parent | 44d02e3f0cf4db7e6d426c75de459019c574500a (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.105.10
Conflicts:
.qmake.conf
Change-Id: Ia407f277cccfdd96242ebfdbe294d699e26e6b1d
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(); |