Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1

Change-Id: Iff02839c8ace49582750e06fa1ea9c559f6c93fe

1 files changed, 6 insertions, 1 deletions

diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp
index 8ce4d0e5..8632e14c 100644
--- a/src/quicktemplates2/qquickabstractbutton.cpp
+++ b/src/quicktemplates2/qquickabstractbutton.cpp
@@ -178,7 +178,7 @@ void QQuickAbstractButtonPrivate::handleRelease(const QPointF &point)
 
     if (wasPressed) {
         emit q->released();
-        if (!wasHeld)
+        if (!wasHeld && !wasDoubleClick)
             trigger();
     } else {
         emit q->canceled();
@@ -188,6 +188,8 @@ void QQuickAbstractButtonPrivate::handleRelease(const QPointF &point)
         stopPressRepeat();
     else
         stopPressAndHold();
+
+    wasDoubleClick = false;
 }
 
 void QQuickAbstractButtonPrivate::handleUngrab()
@@ -201,6 +203,7 @@ void QQuickAbstractButtonPrivate::handleUngrab()
     q->setPressed(false);
     stopPressRepeat();
     stopPressAndHold();
+    wasDoubleClick = false;
     emit q->canceled();
 }
 
@@ -1080,8 +1083,10 @@ void QQuickAbstractButton::mousePressEvent(QMouseEvent *event)
 
 void QQuickAbstractButton::mouseDoubleClickEvent(QMouseEvent *event)
 {
+    Q_D(QQuickAbstractButton);
     QQuickControl::mouseDoubleClickEvent(event);
     emit doubleClicked();
+    d->wasDoubleClick = true;
 }
 
 void QQuickAbstractButton::timerEvent(QTimerEvent *event)