diff options
author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-08-24 09:36:19 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-09-15 07:37:14 +0000 |
commit | fb059f697a128f87ceecf5ddff1dd735ae78db20 (patch) | |
tree | 93ca45c213ef29fbc03b9f2d1a0d011b94ba1405 /src/qml/jsruntime/qv4engine.cpp | |
parent | cedd73279403244bbf4b74da4c3ec60111e60399 (diff) |
Reduce usage of context->parent
Change-Id: I31bb8019783311a7e6065e2aac7fec67c1120ebf
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/jsruntime/qv4engine.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index 78a3037665..d6448f7030 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -731,6 +731,7 @@ Heap::QmlContext *ExecutionEngine::qmlContext() const { Heap::ExecutionContext *ctx = currentContext(); + // get the correct context when we're within a builtin function if (ctx->type == Heap::ExecutionContext::Type_SimpleCallContext && !ctx->outer) ctx = ctx->parent; |