diff options
Diffstat (limited to 'src/qml/jsruntime/qv4script.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4script.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp index 0dddbe87e7..e320656664 100644 --- a/src/qml/jsruntime/qv4script.cpp +++ b/src/qml/jsruntime/qv4script.cpp @@ -252,11 +252,11 @@ ReturnedValue Script::run() QV4::ScopedValue result(valueScope); try { result = vmFunction->code(scope, vmFunction->codeData); - } catch (Exception &e) { + } catch (...) { scope->strictMode = strict; scope->lookups = oldLookups; scope->compilationUnit = oldCompilationUnit; - throw; + scope->rethrowException(); } scope->lookups = oldLookups; @@ -379,8 +379,8 @@ QV4::ReturnedValue Script::evaluate(ExecutionEngine *engine, const QString &scr try { qmlScript.parse(); return qmlScript.run(); - } catch (QV4::Exception &e) { - e.accept(ctx); + } catch (...) { + ctx->catchException(); } return Encode::undefined(); } |
