From 4ba7ad3e4d3ad451413e00affb3746f63620687f Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Thu, 20 Jul 2017 14:55:55 +0200
Subject: 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>
---
 src/quicktemplates2/qquickmenu.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

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;
-- 
cgit v1.2.3