aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsapi/qjsengine.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2014-11-12 13:55:55 +0100
committerSimon Hausmann <simon.hausmann@digia.com>2014-11-15 13:16:28 +0100
commit3dc7b5ddf6de5d9d000f443170d9a33e3d32bda3 (patch)
treebdf725cac352f9d83a6b8d7a4308c867ef2e20e0 /src/qml/jsapi/qjsengine.cpp
parentcd6db04169dcd0f7b49f5875d3c63d94fa32e17a (diff)
Cleanup exception catching code
Change-Id: I85afd5758f72e19c280dc196601ee145f0c25f01 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsapi/qjsengine.cpp')
-rw-r--r--src/qml/jsapi/qjsengine.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp
index 0d2b394cd6..427575b386 100644
--- a/src/qml/jsapi/qjsengine.cpp
+++ b/src/qml/jsapi/qjsengine.cpp
@@ -307,7 +307,7 @@ QJSValue QJSEngine::evaluate(const QString& program, const QString& fileName, in
if (!scope.engine->hasException)
result = script.run();
if (scope.engine->hasException)
- result = ctx->catchException();
+ result = v4->catchException();
if (ctx != v4->rootContext)
v4->popContext();
return new QJSValuePrivate(v4, result);