From e95dc3b4853c1736aef0ef2cc5248ec0aa46e3ff Mon Sep 17 00:00:00 2001
From: Mitch Curtis <mitch.curtis@qt.io>
Date: Fri, 30 Sep 2016 22:47:34 +0200
Subject: Cancel exit transition when the same tooltip is shown again

Task-number: QTBUG-54206
Task-number: QTBUG-54532
Change-Id: I7e4d993e3b1e30d7d7956629604f948dd1c85e32
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
---
 src/quicktemplates2/qquicktooltip.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/quicktemplates2/qquicktooltip.cpp')

diff --git a/src/quicktemplates2/qquicktooltip.cpp b/src/quicktemplates2/qquicktooltip.cpp
index 6b025fe5..b793ada5 100644
--- a/src/quicktemplates2/qquicktooltip.cpp
+++ b/src/quicktemplates2/qquicktooltip.cpp
@@ -256,7 +256,7 @@ QQuickToolTipAttached *QQuickToolTip::qmlAttachedProperties(QObject *object)
 void QQuickToolTip::open()
 {
     Q_D(QQuickToolTip);
-    if (d->delay > 0)
+    if (!d->visible && d->delay > 0)
         d->startDelay();
     else
         QQuickPopup::open();
-- 
cgit v1.2.3