diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-05 13:22:23 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-11 13:01:50 +0200 |
| commit | 6e8e5d16e16d6ee683a5c06a24f8f202ed5239ff (patch) | |
| tree | fa8e710ad0ee4ff6cc9738fa717883c74d452b95 /src/qml/jsruntime/qv4include.cpp | |
| parent | 736afb8e9b3694efb8ca1fa8f3a8eeeaef530da2 (diff) | |
Move CallData onto the JS stack
Change-Id: I22e853acfd2da337344b581bb0412c5f9930c510
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4include.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4include.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4include.cpp b/src/qml/jsruntime/qv4include.cpp index 9068d573f6..647cc7d2cb 100644 --- a/src/qml/jsruntime/qv4include.cpp +++ b/src/qml/jsruntime/qv4include.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qv4include_p.h" +#include "qv4scopedvalue_p.h" #include <QtQml/qjsengine.h> #include <QtNetwork/qnetworkrequest.h> @@ -104,10 +105,10 @@ void QV4Include::callback(const QV4::Value &callback, const QV4::Value &status) QV4::ExecutionContext *ctx = f->engine()->current; try { - CALLDATA(1); - d.thisObject = QV4::Value::fromObject(f->engine()->globalObject); - d.args[0] = status; - f->call(d); + QV4::ScopedCallData callData(ctx->engine, 1); + callData->thisObject = QV4::Value::fromObject(f->engine()->globalObject); + callData->args[0] = status; + f->call(callData); } catch (QV4::Exception &e) { e.accept(ctx); } |