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

Conflicts:
	tests/auto/quick/qquicktext/tst_qquicktext.cpp

Change-Id: I241cd418bb7e7b95e0a0a2ee4c465d48be2a5582

1 files changed, 44 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickmousearea/data/nestedFlickableStopAtBounds.qml b/tests/auto/quick/qquickmousearea/data/nestedFlickableStopAtBounds.qml
new file mode 100644
index 0000000000..0d5b496766
--- /dev/null
+++ b/tests/auto/quick/qquickmousearea/data/nestedFlickableStopAtBounds.qml
@@ -0,0 +1,44 @@
+import QtQuick 2.5
+
+
+Rectangle {
+    width: 240
+    height: 320
+
+    MouseArea {
+        objectName: "mouseArea"
+        anchors.fill: parent
+
+        drag.target: moveable
+        drag.filterChildren: true
+
+        Rectangle {
+            id: moveable
+            objectName: "moveable"
+            color: "red"
+            x: 50
+            y: 80
+            width: 200
+            height: 200
+        }
+
+        Flickable {
+            objectName: "flickable"
+            anchors.fill: parent
+            contentHeight: 450
+
+            Rectangle {
+                x: 100
+                y: 50
+                width: 50
+                height: 350
+                color: "yellow"
+            }
+
+            MouseArea {
+                width: 240
+                height: 450
+            }
+        }
+    }
+}