diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-08-04 18:53:51 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-08-08 18:58:14 +0000 |
| commit | 50e7badd5f261bd69db9d8f03d5651e346087218 (patch) | |
| tree | 73c2771fbc98168280182e77337b06efa39f4a7b /src/qml/qml/qqmljavascriptexpression.cpp | |
| parent | 8abb6c41bf055d59c6b57a809e3b027293568848 (diff) | |
Remove Scope::result and convert calling convention for builtins
Allow for faster calling of builtins, and completely avoid
scope creation in many cases.
Change-Id: I0f1681e19e9908db10def85a74e134a87fc2e44c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmljavascriptexpression.cpp')
| -rw-r--r-- | src/qml/qml/qqmljavascriptexpression.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp index 6c5c00e8ae..981f55a399 100644 --- a/src/qml/qml/qqmljavascriptexpression.cpp +++ b/src/qml/qml/qqmljavascriptexpression.cpp @@ -227,11 +227,10 @@ QV4::ReturnedValue QQmlJavaScriptExpression::evaluate(QV4::CallData *callData, b QV4::ExecutionContext *outer = static_cast<QV4::ExecutionContext *>(m_qmlScope.valueRef()); if (v4Function->canUseSimpleFunction()) { - outer->simpleCall(scope, callData, v4Function); + result = outer->simpleCall(scope, callData, v4Function); } else { - outer->call(scope, callData, v4Function); + result = outer->call(scope, callData, v4Function); } - result = scope.result; if (scope.hasException()) { if (watcher.wasDeleted()) |