diff options
| author | Lars Knoll <[email protected]> | 2013-10-21 09:50:27 +0200 |
|---|---|---|
| committer | The Qt Project <[email protected]> | 2013-10-29 10:38:55 +0100 |
| commit | e0284ab41f7a1889f28e719212df66e942959f4c (patch) | |
| tree | dfbd27e96968c07d49372c6ed06f0b51f2c6c8b8 /src/qml/jsruntime/qv4engine.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 <[email protected]>
Diffstat (limited to 'src/qml/jsruntime/qv4engine.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index 73db54174c..b0ede6fa20 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -838,7 +838,7 @@ ReturnedValue ExecutionEngine::catchException(ExecutionContext *catchingContext, return res; } -QQmlError ExecutionEngine::convertJavaScriptException(ExecutionContext *context) +QQmlError ExecutionEngine::catchExceptionAsQmlError(ExecutionContext *context) { QV4::StackTrace trace; QV4::Scope scope(context); |