Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	.qmake.conf

Change-Id: I4aae04ab8cac381b4a8262a2f47298ca014f4692

1 files changed, 5 insertions, 2 deletions

diff --git a/src/templates/qquickabstractbutton.cpp b/src/templates/qquickabstractbutton.cpp
index 016c6d5a..8e5b59d2 100644
--- a/src/templates/qquickabstractbutton.cpp
+++ b/src/templates/qquickabstractbutton.cpp
@@ -121,6 +121,7 @@ void QQuickAbstractButtonPrivate::startPressAndHold()
 {
     Q_Q(QQuickAbstractButton);
     wasHeld = false;
+    stopPressAndHold();
     if (isPressAndHoldConnected())
         holdTimer = q->startTimer(QGuiApplication::styleHints()->mousePressAndHoldInterval());
 }
@@ -498,8 +499,10 @@ void QQuickAbstractButton::mousePressEvent(QMouseEvent *event)
     if (d->autoRepeat) {
         d->startRepeatDelay();
         d->repeatButton = event->button();
-    } else {
+    } else if (Qt::LeftButton == (event->buttons() & Qt::LeftButton)) {
         d->startPressAndHold();
+    } else {
+        d->stopPressAndHold();
     }
 }
 
@@ -511,7 +514,7 @@ void QQuickAbstractButton::mouseMoveEvent(QMouseEvent *event)
 
     if (d->autoRepeat)
         d->stopPressRepeat();
-    else if (!d->pressed)
+    else if (d->holdTimer > 0 && QLineF(d->pressPoint, event->localPos()).length() > QGuiApplication::styleHints()->startDragDistance())
         d->stopPressAndHold();
 }