Correctly set this object when calling scope/context functions5.6

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>
(cherry picked from commit b2420780df98cb3c98553da18a5b1bc5b64e9e83)

1 files changed, 5 insertions, 0 deletions

diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp
index 0a05c50432..5cd0443b71 100644
--- a/src/qml/jsruntime/qv4runtime.cpp
+++ b/src/qml/jsruntime/qv4runtime.cpp
@@ -956,6 +956,9 @@ ReturnedValue Runtime::callQmlScopeObjectProperty(ExecutionEngine *engine, int p
         QString error = QStringLiteral("Property '%1' of scope object is not a function").arg(propertyIndex);
         return engine->throwTypeError(error);
     }
+
+    QObject *scopeObj = static_cast<const QmlContext &>(callData->thisObject).d()->qml->scopeObject;
+    callData->thisObject = QObjectWrapper::wrap(engine, scopeObj);
     return o->call(callData);
 }
 
@@ -968,6 +971,8 @@ ReturnedValue Runtime::callQmlContextObjectProperty(ExecutionEngine *engine, int
         return engine->throwTypeError(error);
     }
 
+    QObject *contextObject = static_cast<const QmlContext &>(callData->thisObject).d()->qml->context->contextObject;
+    callData->thisObject = QObjectWrapper::wrap(engine, contextObject);
     return o->call(callData);
 }