diff options
Diffstat (limited to 'src/qml/qml/qqmljavascriptexpression.cpp')
-rw-r--r-- | src/qml/qml/qqmljavascriptexpression.cpp | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp index 3b3227cbbb..3b703c9c2a 100644 --- a/src/qml/qml/qqmljavascriptexpression.cpp +++ b/src/qml/qml/qqmljavascriptexpression.cpp @@ -298,24 +298,18 @@ QQmlDelayedError *QQmlJavaScriptExpression::delayedError() void QQmlJavaScriptExpression::exceptionToError(const QV4::Exception &e, QQmlError &error) { + QV4::ExecutionEngine::StackTrace trace = e.stackTrace(); + if (!trace.isEmpty()) { + QV4::ExecutionEngine::StackFrame frame = trace.first(); + error.setUrl(QUrl(frame.source)); + error.setLine(frame.line); + error.setColumn(frame.column); + } QV4::ErrorObject *errorObj = e.value().asErrorObject(); - if (errorObj && errorObj->subtype == QV4::ErrorObject::SyntaxError) { - QV4::DiagnosticMessage *msg = static_cast<QV4::SyntaxErrorObject*>(errorObj)->message(); - error.setUrl(QUrl(msg->fileName)); - error.setLine(msg->startLine); - error.setColumn(msg->startColumn); - error.setDescription(msg->message); - // ### FIXME: support msg->next - } else { - QV4::ExecutionEngine::StackTrace trace = e.stackTrace(); - if (!trace.isEmpty()) { - QV4::ExecutionEngine::StackFrame frame = trace.first(); - error.setUrl(QUrl(frame.source)); - error.setLine(frame.line); - error.setColumn(frame.column); - } + if (errorObj && errorObj->asSyntaxError()) + error.setDescription(errorObj->get(errorObj->engine()->newString("message")).toQString()); + else error.setDescription(e.value().toQString()); - } } QV4::PersistentValue |