diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-09-01 11:48:15 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-09-02 07:12:17 +0000 |
| commit | 74c8fe86755af485f8d0a47799d6d50f00070f05 (patch) | |
| tree | 9e3d8c51d46d9f0fa2555cc77d184d6b3ee1be7d /src/qml/qml/qqmljavascriptexpression.cpp | |
| parent | a91383545c6f487cff61f401d11f1e85939222e9 (diff) | |
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>
Diffstat (limited to 'src/qml/qml/qqmljavascriptexpression.cpp')
| -rw-r--r-- | src/qml/qml/qqmljavascriptexpression.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp index 36881f02ba..e40795283a 100644 --- a/src/qml/qml/qqmljavascriptexpression.cpp +++ b/src/qml/qml/qqmljavascriptexpression.cpp @@ -185,9 +185,9 @@ QV4::ReturnedValue QQmlJavaScriptExpression::evaluate(bool *isUndefined) { QV4::ExecutionEngine *v4 = QV8Engine::getV4(m_context->engine); QV4::Scope scope(v4); - QV4::ScopedCallData callData(scope); + QV4::JSCall jsCall(scope, nullptr); - return evaluate(callData, isUndefined); + return evaluate(jsCall, isUndefined); } QV4::ReturnedValue QQmlJavaScriptExpression::evaluate(QV4::CallData *callData, bool *isUndefined) |