diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-21 10:17:30 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2013-05-21 10:36:47 +0200 |
| commit | 05346f300383b322049e75158c1ab5481bfc2c40 (patch) | |
| tree | e810069cf9f1c2ac2c0a5458dd466ef21cf128c3 /src/qml/qml/qqmlvme.cpp | |
| parent | 4d628bfca64cbbaf2904748d18f04dbc74545312 (diff) | |
Small exception handling fixes
* Don't accept the exception if we're going to re-throw it (partial unwind
is not necessary as we don't have a stack-based context to clean up)
* However do accept() it if we decided to handle it (in qqmlvme.cpp)
Change-Id: I63bfa34f30fe19ad36de746b1f15fc6b641e563b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlvme.cpp')
| -rw-r--r-- | src/qml/qml/qqmlvme.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlvme.cpp b/src/qml/qml/qqmlvme.cpp index af4394b44b..6636e602af 100644 --- a/src/qml/qml/qqmlvme.cpp +++ b/src/qml/qml/qqmlvme.cpp @@ -1245,6 +1245,7 @@ QV4::PersistentValue QQmlVME::run(QQmlContextData *parentCtxt, QQmlScriptData *s try { script->m_program->Run(qmlglobal); } catch (QV4::Exception &e) { + e.accept(ctx); QQmlError error; QQmlExpressionPrivate::exceptionToError(e, error); if (error.isValid()) |