diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-02-15 11:22:14 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-02-15 11:22:23 +0100 |
| commit | f6fec74d4238e304643b99880bdfd8ee32c8578e (patch) | |
| tree | f3880de9e9890cb6b140ba5722d91819b800616f /src/quicktemplates2/qquickpopup.cpp | |
| parent | 72d5d88afe64a76f2026e4a45a4858a13917d4f0 (diff) | |
| parent | d95e67c291d213cdbf41b23c535b47aa3a553ab5 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Id3333e9bb67ced4c6dbae5845512fe1927a7b858
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 0524c688..97e347d7 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(); |