Correctly set this object when calling scope/context functions

When a function is called that is in a QML scope or a QML context, set
the 'this' object to the QML scope.

Note: this patch is 5.9 specific. 5.11 has a similair issue, but the
implementation is quite different, so that needs a separate fix.

Task-number: QTBUG-59357
Change-Id: Ia78e012d413c40a094e957f4020502cd055ac286
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 4 insertions, 0 deletions

diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp
index 28b344d154..124b246701 100644
--- a/src/qml/jsruntime/qv4runtime.cpp
+++ b/src/qml/jsruntime/qv4runtime.cpp
@@ -1064,6 +1064,8 @@ ReturnedValue Runtime::method_callQmlScopeObjectProperty(ExecutionEngine *engine
         return engine->throwTypeError(error);
     }
 
+    auto scopeObj = static_cast<const QmlContext &>(callData->thisObject).d()->qml->scopeObject;
+    callData->thisObject = QObjectWrapper::wrap(engine, scopeObj);
     o->call(scope, callData);
     return scope.result.asReturnedValue();
 }
@@ -1077,6 +1079,8 @@ ReturnedValue Runtime::method_callQmlContextObjectProperty(ExecutionEngine *engi
         return engine->throwTypeError(error);
     }
 
+    auto scopeObj = static_cast<const QmlContext &>(callData->thisObject).d()->qml->context->contextData()->contextObject;
+    callData->thisObject = QObjectWrapper::wrap(engine, scopeObj);
     o->call(scope, callData);
     return scope.result.asReturnedValue();
 }