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, 13 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmllanguage/data/thisInQmlScope.qml b/tests/auto/qml/qqmllanguage/data/thisInQmlScope.qml
index e3c99e70e1..9ff758c33f 100644
--- a/tests/auto/qml/qqmllanguage/data/thisInQmlScope.qml
+++ b/tests/auto/qml/qqmllanguage/data/thisInQmlScope.qml
@@ -6,5 +6,18 @@ QtObject {
         y = this.x;
     }
     property var f: g
+
     Component.onCompleted: f()
+
+    property int a: 42
+    property int b: 0
+    function g_subobj(){
+        b = this.a;
+    }
+    property var f_subobj: g_subobj
+
+    property QtObject subObject: QtObject {
+        property int a: 100
+        Component.onCompleted: f_subobj()
+    }
 }