diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-09 14:33:28 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-12 21:52:00 +0200 |
| commit | a723c7ae756ba567c2f818bb77a83c24373d3438 (patch) | |
| tree | 0508a1c1526e56a7aa3c4a3055c8a4b65a973b06 /src/qml/jsruntime/qv4errorobject.cpp | |
| parent | bf22c55036f6429ccfc849ea71f33e757fae47fa (diff) | |
Use a ReturnedValue when converting to String or Object
Also rename Value::toQString() to Value::toQStringNoThrow(),
and add a throwing toQString() method for JS use.
Change-Id: I821b33fc61abb7d08839df965fd337685f61a545
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4errorobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4errorobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4errorobject.cpp b/src/qml/jsruntime/qv4errorobject.cpp index 6174c9a7f5..96c5f67120 100644 --- a/src/qml/jsruntime/qv4errorobject.cpp +++ b/src/qml/jsruntime/qv4errorobject.cpp @@ -338,12 +338,12 @@ Value ErrorPrototype::method_toString(SimpleCallContext *ctx) if (name->isUndefined()) qname = QString::fromLatin1("Error"); else - qname = __qmljs_to_string(name, ctx).stringValue()->toQString(); + qname = name->toQString(); ScopedValue message(scope, o->get(ctx->engine->newString(QString::fromLatin1("message")))); QString qmessage; if (!message->isUndefined()) - qmessage = __qmljs_to_string(message, ctx).stringValue()->toQString(); + qmessage = message->toQString(); QString str; if (qname.isEmpty()) { |