Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into tqtc/lts-5.15-opensourcev5.15.11-lts-lgpl

Change-Id: I7b6e0ef657d1278405738f682b2795f8c345c3d4

1 files changed, 26 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickmultipointtoucharea/data/nestedMouseArea.qml b/tests/auto/quick/qquickmultipointtoucharea/data/nestedMouseArea.qml
new file mode 100644
index 0000000000..7ca3f187d6
--- /dev/null
+++ b/tests/auto/quick/qquickmultipointtoucharea/data/nestedMouseArea.qml
@@ -0,0 +1,26 @@
+import QtQuick 2.12
+
+Item {
+    id: root
+    width: 300; height: 300
+    property point mptaPoint
+    property point maPoint
+    MultiPointTouchArea {
+        anchors.fill : parent
+        onPressed: function(touchPoints) {
+            root.mptaPoint = Qt.point(touchPoints[0].x, touchPoints[0].y)
+        }
+        MouseArea {
+            id: ma
+            width: 100; height: 100
+            anchors.centerIn: parent
+            onPressed: function(mouse) {
+                root.maPoint = Qt.point(mouse.x, mouse.y)
+            }
+        }
+        Rectangle {
+            anchors.fill: ma
+            border.color: "grey"
+        }
+    }
+}