Always set the correct FunctionObject when calling JS functions

Renamed ScopedCallData to JSCall, enforced passing a JS
FunctionObject to it, and added call() and callAsConstructor()
methods to it.

Change-Id: I30db65c9765c2896b5909fe2105c0934c6dad861
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 8 insertions, 8 deletions

diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp
index 598c12ffd4..c3200fbcea 100644
--- a/src/qml/jsruntime/qv4script.cpp
+++ b/src/qml/jsruntime/qv4script.cpp
@@ -152,16 +152,16 @@ ReturnedValue Script::run()
         ContextStateSaver stateSaver(valueScope, scope);
         scope->d()->v4Function = vmFunction;
 
-        QV4::ScopedCallData cData(scope);
-        cData->thisObject = engine->globalObject;
-        cData->context = *scope;
-        return vmFunction->call(cData);
+        QV4::JSCall jsCall(scope, nullptr);
+        jsCall->thisObject = engine->globalObject;
+        jsCall->context = *scope;
+        return vmFunction->call(jsCall);
     } else {
         Scoped<QmlContext> qml(valueScope, qmlContext.value());
-        ScopedCallData callData(valueScope);
-        callData->thisObject = Primitive::undefinedValue();
-        callData->context = *qml;
-        return vmFunction->call(callData);
+        JSCall jsCall(valueScope, nullptr);
+        jsCall->thisObject = Primitive::undefinedValue();
+        jsCall->context = *qml;
+        return vmFunction->call(jsCall);
     }
 }