diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-11 14:36:01 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-18 13:13:21 +0200 |
| commit | 002e6105f61269f1474de878ccdb26205e5b226e (patch) | |
| tree | ead1d10b7d8aa2537e7073327d9d0d9ce591c995 /src/qml/jsruntime/qv4objectproto.cpp | |
| parent | 1a2a83f80ba4ecc28eba72af57c81bd43a45946c (diff) | |
Require a ValueScope for ScopedCallData as well
This brings things more in line with ScopedValue, and
also simplifies cleanup of Scoped values.
Change-Id: If5f1466b4e13c629d56c1e7c638937f61ba48f77
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4objectproto.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4objectproto.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4objectproto.cpp b/src/qml/jsruntime/qv4objectproto.cpp index 5dc4d333ce..8cab0d2d12 100644 --- a/src/qml/jsruntime/qv4objectproto.cpp +++ b/src/qml/jsruntime/qv4objectproto.cpp @@ -381,12 +381,13 @@ Value ObjectPrototype::method_toString(SimpleCallContext *ctx) Value ObjectPrototype::method_toLocaleString(SimpleCallContext *ctx) { + ValueScope scope(ctx); Object *o = ctx->thisObject.toObject(ctx); Value ts = o->get(ctx->engine->newString(QStringLiteral("toString"))); FunctionObject *f = ts.asFunctionObject(); if (!f) ctx->throwTypeError(); - ScopedCallData callData(ctx->engine, 0); + ScopedCallData callData(scope, 0); callData->thisObject = Value::fromObject(o); return Value::fromReturnedValue(f->call(callData)); } |