diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-18 15:34:13 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-22 01:06:20 +0200 |
| commit | 700ba1bcb39e082049c96fafdfaccfe5d83cd77e (patch) | |
| tree | d21da27b94a927377ba2c6efd7c3af731d890b19 /src/qml/qml/qqmljavascriptexpression.cpp | |
| parent | 1aa618970a9bed46123d0648500e957688d725ec (diff) | |
Use a StringRef for Managed::get()
also store "toString" and "valueOf" as identifiers
in the engine and fix two places where we compared
strings the wrong way.
Change-Id: I70612221e72d43ed0e3c496e4209681bf254cded
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmljavascriptexpression.cpp')
| -rw-r--r-- | src/qml/qml/qqmljavascriptexpression.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp index 5c3e61759a..b1184729d0 100644 --- a/src/qml/qml/qqmljavascriptexpression.cpp +++ b/src/qml/qml/qqmljavascriptexpression.cpp @@ -312,7 +312,8 @@ void QQmlJavaScriptExpression::exceptionToError(const QV4::Exception &e, QQmlErr } QV4::Scoped<QV4::ErrorObject> errorObj(scope, e.value()); if (!!errorObj && errorObj->asSyntaxError()) { - QV4::ScopedValue v(scope, errorObj->get(errorObj->engine()->newString("message"))); + QV4::ScopedString m(scope, errorObj->engine()->newString("message")); + QV4::ScopedValue v(scope, errorObj->get(m)); error.setDescription(v->toQStringNoThrow()); } else { QV4::ScopedValue v(scope, e.value()); |