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/qqmlxmlhttprequest.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/qqmlxmlhttprequest.cpp')
| -rw-r--r-- | src/qml/qml/qqmlxmlhttprequest.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp index a77c4c5678..21f1fb30b0 100644 --- a/src/qml/qml/qqmlxmlhttprequest.cpp +++ b/src/qml/qml/qqmlxmlhttprequest.cpp @@ -1576,9 +1576,7 @@ void QQmlXMLHttpRequest::dispatchCallback(Object *thisObj, QQmlContextData *cont return; } - QV4::ScopedCallData callData(scope); - callData->thisObject = Encode::undefined(); - callback->call(callData); + QV4::JSCall(scope, callback).call(); if (scope.engine->hasException) { QQmlError error = scope.engine->catchExceptionAsQmlError(); |