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

 Conflicts:
	src/qml/compiler/qv4compileddata_p.h
	src/qml/jit/qv4baselinejit.cpp
	src/qml/jit/qv4jithelpers.cpp
	src/qml/jsruntime/qv4lookup.cpp
	src/qml/jsruntime/qv4runtime.cpp
	src/qml/jsruntime/qv4runtimeapi_p.h
	src/qml/jsruntime/qv4vme_moth.cpp
	src/qml/qml/qqmltypemodule_p.h

Change-Id: If28793e9e08418457a11fc2c5832f03cab2fcc76

1 files changed, 8 insertions, 40 deletions

diff --git a/src/qml/jsruntime/qv4runtimeapi_p.h b/src/qml/jsruntime/qv4runtimeapi_p.h
index 0312522d90..86cbccde23 100644
--- a/src/qml/jsruntime/qv4runtimeapi_p.h
+++ b/src/qml/jsruntime/qv4runtimeapi_p.h
@@ -58,7 +58,6 @@ namespace QV4 {
 
 typedef uint Bool;
 
-
 struct Q_QML_PRIVATE_EXPORT Runtime {
     typedef ReturnedValue (*UnaryOperation)(const Value &value);
     typedef ReturnedValue (*BinaryOperation)(const Value &left, const Value &right);
@@ -87,6 +86,10 @@ struct Q_QML_PRIVATE_EXPORT Runtime {
     {
         static ReturnedValue call(ExecutionEngine *, uint, Value[], int);
     };
+    struct Q_QML_PRIVATE_EXPORT CallQmlContextPropertyLookup : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, uint, Value[], int);
+    };
     struct Q_QML_PRIVATE_EXPORT CallName : Method<Throws::Yes>
     {
         static ReturnedValue call(ExecutionEngine *, int, Value[], int);
@@ -187,6 +190,10 @@ struct Q_QML_PRIVATE_EXPORT Runtime {
     {
         static ReturnedValue call(ExecutionEngine *, Function *, int);
     };
+    struct Q_QML_PRIVATE_EXPORT LoadQmlContextPropertyLookup : Method<Throws::Yes>
+    {
+        static ReturnedValue call(ExecutionEngine *, uint);
+    };
     struct Q_QML_PRIVATE_EXPORT GetLookup : Method<Throws::Yes>
     {
         static ReturnedValue call(ExecutionEngine *, Function *, const Value &, int);
@@ -495,45 +502,6 @@ struct Q_QML_PRIVATE_EXPORT Runtime {
         static ReturnedValue call(Function *, int);
     };
 
-    /* qml */
-    struct Q_QML_PRIVATE_EXPORT LoadQmlContext : Method<Throws::No>
-    {
-        static ReturnedValue call(ExecutionEngine *);
-    };
-    struct Q_QML_PRIVATE_EXPORT LoadQmlImportedScripts : Method<Throws::No>
-    {
-        static ReturnedValue call(ExecutionEngine *);
-    };
-    struct Q_QML_PRIVATE_EXPORT LoadQmlScopeObjectProperty : Method<Throws::Yes>
-    {
-        static ReturnedValue call(ExecutionEngine *, const Value &, int, Bool);
-    };
-    struct Q_QML_PRIVATE_EXPORT LoadQmlContextObjectProperty : Method<Throws::Yes>
-    {
-        static ReturnedValue call(ExecutionEngine *, const Value &, int, Bool);
-    };
-    struct Q_QML_PRIVATE_EXPORT LoadQmlIdObject : Method<Throws::Yes>
-    {
-        static ReturnedValue call(ExecutionEngine *, const Value &, uint);
-    };
-    struct Q_QML_PRIVATE_EXPORT CallQmlScopeObjectProperty : Method<Throws::Yes>
-    {
-        static ReturnedValue call(ExecutionEngine *, const Value &, int, Value[], int);
-    };
-    struct Q_QML_PRIVATE_EXPORT CallQmlContextObjectProperty : Method<Throws::Yes>
-    {
-        static ReturnedValue call(ExecutionEngine *, const Value &, int, Value[], int);
-    };
-
-    struct Q_QML_PRIVATE_EXPORT StoreQmlScopeObjectProperty : Method<Throws::Yes>
-    {
-        static void call(ExecutionEngine *, const Value &, int, const Value &);
-    };
-    struct Q_QML_PRIVATE_EXPORT StoreQmlContextObjectProperty : Method<Throws::Yes>
-    {
-        static void call(ExecutionEngine *, const Value &, int, const Value &);
-    };
-
     struct StackOffsets {
         static const int tailCall_function   = -1;
         static const int tailCall_thisObject = -2;