Merge remote-tracking branch 'origin/5.10.1' into 5.11

Change-Id: I64bf7d183bbd8af7282270097809d14a54ba0188

1 files changed, 14 insertions, 0 deletions

diff --git a/tests/auto/quick/pointerhandlers/flickableinterop/tst_flickableinterop.cpp b/tests/auto/quick/pointerhandlers/flickableinterop/tst_flickableinterop.cpp
index 7862d72db8..c0b34f8246 100644
--- a/tests/auto/quick/pointerhandlers/flickableinterop/tst_flickableinterop.cpp
+++ b/tests/auto/quick/pointerhandlers/flickableinterop/tst_flickableinterop.cpp
@@ -544,6 +544,20 @@ void tst_FlickableInterop::mouseDragFlickableBehindItemWithHandlers()
         QCOMPARE(originP1 + QPoint(3*dragThreshold, 0), p1);
     }
     QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, p1);
+    // wait until flickable stops
+    QTRY_COMPARE(flickable->isMoving(), false);
+
+    // After the mouse button has been released, move the mouse and ensure that nothing is moving
+    // because of that (this tests if all grabs are released when the mouse button is released).
+    p1 = rect->mapToScene(rect->clipRect().center()).toPoint();
+    originP1 = p1;
+    for (int i = 0; i < 3; ++i) {
+        p1 += QPoint(dragThreshold, 0);
+        QTest::mouseMove(window, p1);
+        QQuickTouchUtils::flush(window);
+    }
+    QCOMPARE(flickable->isMoving(), false);
+    QCOMPARE(originP1, rect->mapToScene(rect->clipRect().center()).toPoint());
 }
 
 QTEST_MAIN(tst_FlickableInterop)