diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-10-21 09:50:27 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-29 10:38:55 +0100 |
| commit | e0284ab41f7a1889f28e719212df66e942959f4c (patch) | |
| tree | dfbd27e96968c07d49372c6ed06f0b51f2c6c8b8 /src/qml/qml/qqmlcomponent.cpp | |
| parent | 59cc901d3d15079b3666e5902b4c8b1a83ff1fd2 (diff) | |
Properly propagate parse errors
Replace all try/catch statements used when parsing
with checks for engine->hasException.
Change-Id: I4493cb600d5a3eb095c2003bb88bd031403e47c9
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlcomponent.cpp')
| -rw-r--r-- | src/qml/qml/qqmlcomponent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index ab08fb78e3..0314e4d2a9 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -1573,7 +1573,7 @@ void QmlIncubatorObject::statusChanged(QQmlIncubator::Status s) callData->args[0] = QV4::Primitive::fromUInt32(s); f->call(callData); } catch (...) { - QQmlError error = QV4::ExecutionEngine::convertJavaScriptException(ctx); + QQmlError error = QV4::ExecutionEngine::catchExceptionAsQmlError(ctx); QQmlEnginePrivate::warning(QQmlEnginePrivate::get(v8->engine()), error); } } |