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

Conflicts:
	src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
	src/qml/jit/qv4assembler.cpp
	src/qml/jit/qv4assembler_p.h
	src/qml/jit/qv4isel_masm.cpp
	src/qml/jsruntime/qv4context.cpp
	src/qml/jsruntime/qv4context_p.h
	src/qml/jsruntime/qv4engine.cpp
	src/qml/jsruntime/qv4vme_moth.cpp
	src/qml/memory/qv4mmdefs_p.h

Change-Id: I9966750b7cd9106b78e4c4779f12b95a481cca40

1 files changed, 41 insertions, 1 deletions

diff --git a/src/imports/testlib/plugins.qmltypes b/src/imports/testlib/plugins.qmltypes
index 563778e55e..5d7ca51adc 100644
--- a/src/imports/testlib/plugins.qmltypes
+++ b/src/imports/testlib/plugins.qmltypes
@@ -4,11 +4,45 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable -noforceqtquick QtTest 1.1'
+// 'qmlplugindump -nonrelocatable -noforceqtquick QtTest 1.2'
 
 Module {
     dependencies: ["QtQuick 2.0"]
     Component {
+        name: "QQuickTouchEventSequence"
+        prototype: "QObject"
+        Method {
+            name: "press"
+            type: "QObject*"
+            Parameter { name: "touchId"; type: "int" }
+            Parameter { name: "item"; type: "QObject"; isPointer: true }
+            Parameter { name: "x"; type: "double" }
+            Parameter { name: "y"; type: "double" }
+        }
+        Method {
+            name: "move"
+            type: "QObject*"
+            Parameter { name: "touchId"; type: "int" }
+            Parameter { name: "item"; type: "QObject"; isPointer: true }
+            Parameter { name: "x"; type: "double" }
+            Parameter { name: "y"; type: "double" }
+        }
+        Method {
+            name: "release"
+            type: "QObject*"
+            Parameter { name: "touchId"; type: "int" }
+            Parameter { name: "item"; type: "QObject"; isPointer: true }
+            Parameter { name: "x"; type: "double" }
+            Parameter { name: "y"; type: "double" }
+        }
+        Method {
+            name: "stationary"
+            type: "QObject*"
+            Parameter { name: "touchId"; type: "int" }
+        }
+        Method { name: "commit"; type: "QObject*" }
+    }
+    Component {
         name: "QuickTestEvent"
         prototype: "QObject"
         exports: ["QtTest/TestEvent 1.0"]
@@ -127,6 +161,12 @@ Module {
             Parameter { name: "yDelta"; type: "int" }
             Parameter { name: "delay"; type: "int" }
         }
+        Method {
+            name: "touchEvent"
+            type: "QQuickTouchEventSequence*"
+            Parameter { name: "item"; type: "QObject"; isPointer: true }
+        }
+        Method { name: "touchEvent"; type: "QQuickTouchEventSequence*" }
     }
     Component {
         name: "QuickTestResult"