Merge remote-tracking branch 'origin/tqtc/lts-5.15.10' into tqtc/lts-5.15-opensourcev5.15.10-lts-lgpl

Change-Id: I1e6656a4356246b153ca4bfb210027ad46242e5a

1 files changed, 4 insertions, 3 deletions

diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
index bbbd0e62..409fb582 100644
--- a/src/quicktemplates2/qquickcontrol.cpp
+++ b/src/quicktemplates2/qquickcontrol.cpp
@@ -179,9 +179,10 @@ bool QQuickControlPrivate::acceptTouch(const QTouchEvent::TouchPoint &point)
 
     // If the control is on a Flickable that has a pressDelay, then the press is never
     // sent as a touch event, therefore we need to check for this case.
-    if (touchId == -1 && pressWasTouch && point.state() == Qt::TouchPointReleased &&
-        point.pos() == previousPressPos) {
-        return true;
+    if (touchId == -1 && pressWasTouch && point.state() == Qt::TouchPointReleased) {
+        const auto delta = QVector2D(point.pos() - previousPressPos);
+        if (!QQuickWindowPrivate::dragOverThreshold(delta))
+            return true;
     }
     return false;
 }