aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4context.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/qml/jsruntime/qv4context.cpp')
-rw-r--r--src/qml/jsruntime/qv4context.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4context.cpp b/src/qml/jsruntime/qv4context.cpp
index 7d7f5dda25..29fdc333f8 100644
--- a/src/qml/jsruntime/qv4context.cpp
+++ b/src/qml/jsruntime/qv4context.cpp
@@ -572,7 +572,8 @@ Value ExecutionContext::getPropertyAndBase(String *name, Object **base)
bool hasProperty = false;
Value v = c->activation->get(name, &hasProperty);
if (hasProperty) {
- *base = c->activation;
+ if (ctx->type == Type_QmlContext)
+ *base = c->activation;
return v;
}
}