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/qv4lookup.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/qv4lookup.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4lookup.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/qml/jsruntime/qv4lookup.cpp b/src/qml/jsruntime/qv4lookup.cpp index 2cffa55642..b630bbed5b 100644 --- a/src/qml/jsruntime/qv4lookup.cpp +++ b/src/qml/jsruntime/qv4lookup.cpp @@ -205,7 +205,7 @@ void Lookup::getterAccessor0(Lookup *l, Value *result, const Value &object) } else { ScopedCallData callData(o->engine(), 0); callData->thisObject = object; - res = getter->call(callData); + res = Value::fromReturnedValue(getter->call(callData)); } if (result) *result = res; @@ -228,7 +228,7 @@ void Lookup::getterAccessor1(Lookup *l, Value *result, const Value &object) } else { ScopedCallData callData(o->engine(), 0); callData->thisObject = object; - res = getter->call(callData); + res = Value::fromReturnedValue(getter->call(callData)); } if (result) *result = res; @@ -254,7 +254,7 @@ void Lookup::getterAccessor2(Lookup *l, Value *result, const Value &object) } else { ScopedCallData callData(o->engine(), 0); callData->thisObject = object; - res = getter->call(callData); + res = Value::fromReturnedValue(getter->call(callData)); } if (result) *result = res; @@ -309,7 +309,7 @@ void Lookup::primitiveGetterAccessor0(Lookup *l, Value *result, const Value &obj } else { ScopedCallData callData(o->engine(), 0); callData->thisObject = object; - res = getter->call(callData); + res = Value::fromReturnedValue(getter->call(callData)); } if (result) *result = res; @@ -333,7 +333,7 @@ void Lookup::primitiveGetterAccessor1(Lookup *l, Value *result, const Value &obj } else { ScopedCallData callData(o->engine(), 0); callData->thisObject = object; - res = getter->call(callData); + res = Value::fromReturnedValue(getter->call(callData)); } if (result) *result = res; @@ -437,7 +437,7 @@ void Lookup::globalGetterAccessor0(Lookup *l, ExecutionContext *ctx, Value *resu } else { ScopedCallData callData(ctx->engine, 0); callData->thisObject = Value::undefinedValue(); - *result = getter->call(callData); + *result = Value::fromReturnedValue(getter->call(callData)); } return; } @@ -456,7 +456,7 @@ void Lookup::globalGetterAccessor1(Lookup *l, ExecutionContext *ctx, Value *resu } else { ScopedCallData callData(ctx->engine, 0); callData->thisObject = Value::undefinedValue(); - *result = getter->call(callData); + *result = Value::fromReturnedValue(getter->call(callData)); } return; } @@ -478,7 +478,7 @@ void Lookup::globalGetterAccessor2(Lookup *l, ExecutionContext *ctx, Value *resu } else { ScopedCallData callData(ctx->engine, 0); callData->thisObject = Value::undefinedValue(); - *result = getter->call(callData); + *result = Value::fromReturnedValue(getter->call(callData)); } return; } |