aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlvmemetaobject.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2017-10-20 16:00:56 +0200
committerLars Knoll <lars.knoll@qt.io>2017-11-07 09:00:37 +0000
commita59d9a7eacea3614462eb910e03351cbb9d34b75 (patch)
tree6ccb0dedfc7fd12279183aa5e5f15413c0b5e7df /src/qml/qml/qqmlvmemetaobject.cpp
parent98271afabd409defee3b1f09158e64fabbc35070 (diff)
Get rid of JSCallData::call()
Change-Id: I6b99e9a7102b3dcb6a7699f54b6456eba6248699 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlvmemetaobject.cpp')
-rw-r--r--src/qml/qml/qqmlvmemetaobject.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp
index d6f7b18744..efd67bc446 100644
--- a/src/qml/qml/qqmlvmemetaobject.cpp
+++ b/src/qml/qml/qqmlvmemetaobject.cpp
@@ -950,13 +950,13 @@ int QQmlVMEMetaObject::metaCall(QObject *o, QMetaObject::Call c, int _id, void *
}
const unsigned int parameterCount = function->formalParameterCount();
- QV4::JSCallData jsCall(scope, function, parameterCount);
- jsCall->thisObject = ep->v8engine()->global();
+ QV4::JSCallData jsCallData(scope, function, parameterCount);
+ jsCallData->thisObject = ep->v8engine()->global();
for (uint ii = 0; ii < parameterCount; ++ii)
- jsCall->args[ii] = scope.engine->fromVariant(*(QVariant *)a[ii + 1]);
+ jsCallData->args[ii] = scope.engine->fromVariant(*(QVariant *)a[ii + 1]);
- QV4::ScopedValue result(scope, jsCall.call());
+ QV4::ScopedValue result(scope, function->call(jsCallData));
if (scope.hasException()) {
QQmlError error = scope.engine->catchExceptionAsQmlError();
if (error.isValid())