Merge remote-tracking branch 'origin/5.9' into 5.10

 Conflicts:
	src/qml/compiler/qv4compileddata.cpp
	src/qml/compiler/qv4compileddata_p.h
	src/qml/jsruntime/qv4engine.cpp
	src/qml/jsruntime/qv4qmlcontext.cpp
	src/qml/jsruntime/qv4qmlcontext_p.h
	src/qml/jsruntime/qv4regexpobject.cpp
	src/qml/jsruntime/qv4regexpobject_p.h
	src/qml/types/qqmllistmodel.cpp
	src/quick/items/qquickanimatedimage_p.h
	src/quick/scenegraph/qsgrenderloop.cpp
	tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp

Change-Id: If20ef62b2c98bdf656cb2f5d27b1897b754d3dc0

1 files changed, 35 insertions, 5 deletions

diff --git a/tests/auto/quick/qquickmultipointtoucharea/data/nonOverlapping.qml b/tests/auto/quick/qquickmultipointtoucharea/data/nonOverlapping.qml
index 039607e26c..027f90c7f4 100644
--- a/tests/auto/quick/qquickmultipointtoucharea/data/nonOverlapping.qml
+++ b/tests/auto/quick/qquickmultipointtoucharea/data/nonOverlapping.qml
@@ -11,9 +11,21 @@ Rectangle {
         maximumTouchPoints: 2
         onGestureStarted: gesture.grab()
         touchPoints: [
-            TouchPoint { objectName: "point11" },
-            TouchPoint { objectName: "point12" }
+            TouchPoint { id: point11; objectName: "point11" },
+            TouchPoint { id: point12; objectName: "point12" }
         ]
+        Rectangle {
+            color: "red"
+            width: 10; height: 10; radius: 5
+            x: point11.x - radius; y: point11.y - radius
+            visible: point11.pressed
+        }
+        Rectangle {
+            color: "tomato"
+            width: 10; height: 10; radius: 5
+            x: point12.x - radius; y: point12.y - radius
+            visible: point12.pressed
+        }
     }
 
     MultiPointTouchArea {
@@ -24,9 +36,27 @@ Rectangle {
         maximumTouchPoints: 3
         onGestureStarted: gesture.grab()
         touchPoints: [
-            TouchPoint { objectName: "point21" },
-            TouchPoint { objectName: "point22" },
-            TouchPoint { objectName: "point23" }
+            TouchPoint { id: point21; objectName: "point21" },
+            TouchPoint { id: point22; objectName: "point22" },
+            TouchPoint { id: point23; objectName: "point23" }
         ]
+        Rectangle {
+            color: "lightgreen"
+            width: 10; height: 10; radius: 5
+            x: point21.x - radius; y: point21.y - radius
+            visible: point21.pressed
+        }
+        Rectangle {
+            color: "green"
+            width: 10; height: 10; radius: 5
+            x: point22.x - radius; y: point22.y - radius
+            visible: point22.pressed
+        }
+        Rectangle {
+            color: "darkgreen"
+            width: 10; height: 10; radius: 5
+            x: point23.x - radius; y: point23.y - radius
+            visible: point23.pressed
+        }
     }
 }