diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-09-26 12:04:52 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-28 13:33:46 +0200 |
commit | d2e2a5b59c617e6cf7236cf36e9c20fe9ea36fdb (patch) | |
tree | 1fc21beff4add85e68a61b7c88b5d5f928bec6e8 /src/qml/jsruntime/qv4objectproto.cpp | |
parent | 18d4794e3f614eec8594f6636d569af8bc112618 (diff) |
Remove Value::fromString()
replaced with call to the GC safe ExceutionEngine::newString()
method.
Change-Id: I7258296e75ca724ff42b94a0d147bc33a05f8f68
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4objectproto.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4objectproto.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4objectproto.cpp b/src/qml/jsruntime/qv4objectproto.cpp index fb47c4a15e..49bee363a3 100644 --- a/src/qml/jsruntime/qv4objectproto.cpp +++ b/src/qml/jsruntime/qv4objectproto.cpp @@ -388,13 +388,13 @@ ReturnedValue ObjectPrototype::method_toString(SimpleCallContext *ctx) { Scope scope(ctx); if (ctx->callData->thisObject.isUndefined()) { - return Value::fromString(ctx, QStringLiteral("[object Undefined]")).asReturnedValue(); + return ctx->engine->newString(QStringLiteral("[object Undefined]"))->asReturnedValue(); } else if (ctx->callData->thisObject.isNull()) { - return Value::fromString(ctx, QStringLiteral("[object Null]")).asReturnedValue(); + return ctx->engine->newString(QStringLiteral("[object Null]"))->asReturnedValue(); } else { ScopedObject obj(scope, __qmljs_to_object(ctx, ValueRef(&ctx->callData->thisObject))); QString className = obj->className(); - return Value::fromString(ctx, QString::fromUtf8("[object %1]").arg(className)).asReturnedValue(); + return ctx->engine->newString(QString::fromUtf8("[object %1]").arg(className))->asReturnedValue(); } } |