Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I6fc67bf30a901f8078a5b99a9e290190b3f64b81

1 files changed, 26 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickflickable/data/nestedmousearea.qml b/tests/auto/quick/qquickflickable/data/nestedmousearea.qml
new file mode 100644
index 0000000000..f8f1e59244
--- /dev/null
+++ b/tests/auto/quick/qquickflickable/data/nestedmousearea.qml
@@ -0,0 +1,26 @@
+import QtQuick 2.0
+
+Flickable {
+    id: outer
+    objectName: "flickable"
+    width: 400
+    height: 400
+    contentX: 50
+    contentY: 50
+    contentWidth: 500
+    contentHeight: 500
+
+    Rectangle {
+        objectName: "nested"
+        x: 100
+        y: 100
+        width: 300
+        height: 300
+
+        color: "yellow"
+        MouseArea {
+            anchors.fill: parent
+            drag.target: parent
+        }
+    }
+}