diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-07-20 14:55:55 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-07-21 07:34:53 +0000 |
| commit | 4ba7ad3e4d3ad451413e00affb3746f63620687f (patch) | |
| tree | ccea5f85f30520137149ba43cd2e9ad71e2ad221 /src/quicktemplates2/qquickmenu.cpp | |
| parent | fe99ec537d0d247f8a4150341a25a54ec89353ef (diff) | |
QQuickMenu: make sure to stop the hover timer when closing
This seems to be one of the reasons why tst_QQuickMenuBar has had
troubles in a busy CI environment.
Change-Id: Ifa20c309eac86e8f47ba0a8c3da76a58f00465cb
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickmenu.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickmenu.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp index ab4f6b56..e5af1592 100644 --- a/src/quicktemplates2/qquickmenu.cpp +++ b/src/quicktemplates2/qquickmenu.cpp @@ -403,6 +403,8 @@ bool QQuickMenuPrivate::prepareExitTransition() if (!QQuickPopupPrivate::prepareExitTransition()) return false; + stopHoverTimer(); + QQuickMenu *subMenu = currentSubMenu(); while (subMenu) { QPointer<QQuickMenuItem> currentSubMenuItem = QQuickMenuPrivate::get(subMenu)->currentItem; |