diff options
Diffstat (limited to 'src/qml/qml/qqmljavascriptexpression.cpp')
| -rw-r--r-- | src/qml/qml/qqmljavascriptexpression.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp index 2974bbcfbe..c86309027f 100644 --- a/src/qml/qml/qqmljavascriptexpression.cpp +++ b/src/qml/qml/qqmljavascriptexpression.cpp @@ -86,7 +86,7 @@ void QQmlDelayedError::setErrorObject(QObject *object) void QQmlDelayedError::setError(const QV4::Exception &e) { - m_error.setDescription(e.value().toQString()); + m_error.setDescription(e.value().toQStringNoThrow()); QV4::ExecutionEngine::StackTrace trace = e.stackTrace(); if (!trace.isEmpty()) { QV4::ExecutionEngine::StackFrame frame = trace.first(); @@ -311,9 +311,9 @@ void QQmlJavaScriptExpression::exceptionToError(const QV4::Exception &e, QQmlErr } QV4::ErrorObject *errorObj = e.value().asErrorObject(); if (errorObj && errorObj->asSyntaxError()) - error.setDescription(errorObj->get(errorObj->engine()->newString("message")).toQString()); + error.setDescription(errorObj->get(errorObj->engine()->newString("message")).toQStringNoThrow()); else - error.setDescription(e.value().toQString()); + error.setDescription(e.value().toQStringNoThrow()); } QV4::PersistentValue |