aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4dateobject.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-09-11 13:55:01 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-18 13:13:18 +0200
commit1a2a83f80ba4ecc28eba72af57c81bd43a45946c (patch)
treec2e4eb4d9bb57873ca340f6bbbf2342b36c91452 /src/qml/jsruntime/qv4dateobject.cpp
parent826550af450b39f47a3c00ec316acf1e317f12c6 (diff)
Use a ReturnedValue for Managed::call()
Change-Id: Ief2d75e9789dd367c603d90dc0fe5316a0d055e3 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4dateobject.cpp')
-rw-r--r--src/qml/jsruntime/qv4dateobject.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4dateobject.cpp b/src/qml/jsruntime/qv4dateobject.cpp
index 1ef4aec246..ec4c0028a0 100644
--- a/src/qml/jsruntime/qv4dateobject.cpp
+++ b/src/qml/jsruntime/qv4dateobject.cpp
@@ -693,10 +693,10 @@ Value DateCtor::construct(Managed *m, CallData *callData)
return Value::fromObject(o);
}
-Value DateCtor::call(Managed *m, CallData *)
+ReturnedValue DateCtor::call(Managed *m, CallData *)
{
double t = currentTime();
- return Value::fromString(m->engine()->current, ToString(t));
+ return Value::fromString(m->engine()->current, ToString(t)).asReturnedValue();
}
void DatePrototype::init(ExecutionContext *ctx, const Value &ctor)
@@ -1305,7 +1305,7 @@ Value DatePrototype::method_toJSON(SimpleCallContext *ctx)
ScopedCallData callData(ctx->engine, 0);
callData->thisObject = ctx->thisObject;
- return toIso->call(callData);
+ return Value::fromReturnedValue(toIso->call(callData));
}
void DatePrototype::timezoneUpdated()