diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-09-11 13:55:01 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-18 13:13:18 +0200 |
commit | 1a2a83f80ba4ecc28eba72af57c81bd43a45946c (patch) | |
tree | c2e4eb4d9bb57873ca340f6bbbf2342b36c91452 /src/qml/jsruntime/qv4script.cpp | |
parent | 826550af450b39f47a3c00ec316acf1e317f12c6 (diff) |
Use a ReturnedValue for Managed::call()
Change-Id: Ief2d75e9789dd367c603d90dc0fe5316a0d055e3
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4script.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4script.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp index 23d84a8b47..57938ff5b7 100644 --- a/src/qml/jsruntime/qv4script.cpp +++ b/src/qml/jsruntime/qv4script.cpp @@ -79,7 +79,7 @@ struct QmlBindingWrapper : FunctionObject scope->engine->popContext(); } - static Value call(Managed *that, CallData *); + static ReturnedValue call(Managed *that, CallData *); static void markObjects(Managed *m) { QmlBindingWrapper *wrapper = static_cast<QmlBindingWrapper*>(m); @@ -122,7 +122,7 @@ struct CompilationUnitHolder : public QV4::Object DEFINE_MANAGED_VTABLE(CompilationUnitHolder); -Value QmlBindingWrapper::call(Managed *that, CallData *) +ReturnedValue QmlBindingWrapper::call(Managed *that, CallData *) { ExecutionEngine *engine = that->engine(); ValueScope scope(engine); @@ -134,7 +134,7 @@ Value QmlBindingWrapper::call(Managed *that, CallData *) ScopedValue result(scope, This->function->code(ctx, This->function->codeData)); engine->popContext(); - return result; + return result.asReturnedValue(); } @@ -252,7 +252,7 @@ Value Script::run() FunctionObject *f = new (engine->memoryManager) QmlBindingWrapper(scope, vmFunction, qml.value().asObject()); ScopedCallData callData(scope->engine, 0); callData->thisObject = Value::undefinedValue(); - return f->call(callData); + return Value::fromReturnedValue(f->call(callData)); } } |