3 files changed, 31 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickflickable/data/keepGrab.qml b/tests/auto/quick/qquickflickable/data/keepGrab.qml
new file mode 100644
index 0000000000..32546658d0
--- /dev/null
+++ b/tests/auto/quick/qquickflickable/data/keepGrab.qml
@@ -0,0 +1,22 @@
+import QtQuick 2.3
+
+Flickable {
+    id: flickable
+    width: 400
+    height: 400
+    contentWidth: 800
+    contentHeight: 800
+
+    Rectangle {
+        x: 200
+        y: 200
+        width: 400
+        height: 400
+        color: "green"
+        MouseArea {
+            id: ma
+            objectName: "ma"
+            anchors.fill: parent
+        }
+    }
+}
diff --git a/tests/auto/quick/qquickflickable/data/nestedStopAtBounds.qml b/tests/auto/quick/qquickflickable/data/nestedStopAtBounds.qml
index 59318e5b95..81187f3c2f 100644
--- a/tests/auto/quick/qquickflickable/data/nestedStopAtBounds.qml
+++ b/tests/auto/quick/qquickflickable/data/nestedStopAtBounds.qml
@@ -32,6 +32,10 @@ Flickable {
                 anchors.margins: 100
                 color: "blue"
             }
+            MouseArea {
+                anchors.fill: parent
+                objectName: "mouseArea"
+            }
         }
     }
 }
diff --git a/tests/auto/quick/qquickflickable/data/wheel.qml b/tests/auto/quick/qquickflickable/data/wheel.qml
index 2928bbcd72..2be543cdde 100644
--- a/tests/auto/quick/qquickflickable/data/wheel.qml
+++ b/tests/auto/quick/qquickflickable/data/wheel.qml
@@ -8,9 +8,14 @@ Rectangle {
     Flickable {
         id: flick
         objectName: "flick"
+        property bool ended: false
+        property int movementsAfterEnd: 0
         anchors.fill: parent
         contentWidth: 800
         contentHeight: 800
+        onContentXChanged: if (ended) ++movementsAfterEnd
+        onContentYChanged: if (ended) ++movementsAfterEnd
+        onMovementEnded: ended = true
 
         Rectangle {
             width: flick.contentWidth