aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmljavascriptexpression.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/qml/qml/qqmljavascriptexpression.cpp')
-rw-r--r--src/qml/qml/qqmljavascriptexpression.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp
index 3b703c9c2a..41be44a0a7 100644
--- a/src/qml/qml/qqmljavascriptexpression.cpp
+++ b/src/qml/qml/qqmljavascriptexpression.cpp
@@ -125,7 +125,8 @@ QV4::Value
QQmlJavaScriptExpression::evaluate(QQmlContextData *context,
const QV4::Value &function, bool *isUndefined)
{
- return evaluate(context, function, 0, 0, isUndefined);
+ QV4::Value args[QV4::Global::ReservedArgumentCount];
+ return evaluate(context, function, 0, args, isUndefined);
}
QV4::Value
@@ -172,7 +173,11 @@ QQmlJavaScriptExpression::evaluate(QQmlContextData *context,
This = value;
}
- result = function.asFunctionObject()->call(This, args, argc);
+ QV4::CallData d;
+ d.thisObject = This;
+ d.args = args;
+ d.argc = argc;
+ result = function.asFunctionObject()->call(d);
if (isUndefined)
*isUndefined = result.isUndefined();