aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsapi/qjsvalueiterator.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/qjsvalueiterator.cpp
parentcd6db04169dcd0f7b49f5875d3c63d94fa32e17a (diff)
Cleanup exception catching code
Change-Id: I85afd5758f72e19c280dc196601ee145f0c25f01 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsapi/qjsvalueiterator.cpp')
-rw-r--r--src/qml/jsapi/qjsvalueiterator.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qml/jsapi/qjsvalueiterator.cpp b/src/qml/jsapi/qjsvalueiterator.cpp
index cc6953cbf7..7eb1de45b1 100644
--- a/src/qml/jsapi/qjsvalueiterator.cpp
+++ b/src/qml/jsapi/qjsvalueiterator.cpp
@@ -190,13 +190,12 @@ QJSValue QJSValueIterator::value() const
if (!obj)
return QJSValue();
- QV4::ExecutionContext *ctx = engine->currentContext();
if (!d_ptr->currentName && d_ptr->currentIndex == UINT_MAX)
return QJSValue();
QV4::ScopedValue v(scope, obj->getValue(obj, &d_ptr->currentProperty, d_ptr->currentAttributes));
if (scope.hasException()) {
- ctx->catchException();
+ engine->catchException();
return QJSValue();
}
return new QJSValuePrivate(engine, v);