diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2016-05-18 11:06:37 +0200 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2016-05-19 07:07:47 +0000 |
commit | 9a1c9459a61cdd3ddb1bd0608a2caa9bae632e58 (patch) | |
tree | f9e30294481cf2d60fe42a42d4016be9becf3774 /src/quicktemplates2/qquickpopup_p_p.h | |
parent | 82c422b5b1c81f0572fdb2be1efba900200680d8 (diff) |
Don't restore focus to contentItem when a focusless popup was closed
For example, a ToolTip shouldn't affect focus when it closes.
Task-number: QTBUG-53420
Task-number: QTBUG-53451
Change-Id: Ic945e98a2ffd86e9f9f06724b16e5f240c3f94de
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickpopup_p_p.h')
-rw-r--r-- | src/quicktemplates2/qquickpopup_p_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickpopup_p_p.h b/src/quicktemplates2/qquickpopup_p_p.h index 5e4e6c51..9ea5a7f0 100644 --- a/src/quicktemplates2/qquickpopup_p_p.h +++ b/src/quicktemplates2/qquickpopup_p_p.h @@ -190,6 +190,7 @@ public: bool hasBottomMargin; bool allowVerticalFlip; bool allowHorizontalFlip; + bool hadActiveFocusBeforeExitTransition; qreal x; qreal y; qreal effectiveX; |