aboutsummaryrefslogtreecommitdiffstats
path: root/qmljs_environment.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2012-12-04 14:12:51 -0800
committerSimon Hausmann <simon.hausmann@digia.com>2012-12-05 01:05:16 +0100
commit0a509b1b6d9bd0726a25c1236a5bab1d7e3c432f (patch)
tree7b49439fcf7a5b9cf3ce9cb90450bbfa05c62521 /qmljs_environment.cpp
parent4216bf0fe07ccb570eed67c4f7af810335138386 (diff)
Use __get__, so that accessor properties work correctly
Change-Id: I99f06c09017b50bffeb34a8158f0dbf902c75945 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'qmljs_environment.cpp')
-rw-r--r--qmljs_environment.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/qmljs_environment.cpp b/qmljs_environment.cpp
index ca3c43bd4b..0127b04852 100644
--- a/qmljs_environment.cpp
+++ b/qmljs_environment.cpp
@@ -271,8 +271,8 @@ Value ExecutionContext::getProperty(String *name)
if (ctx->withObject) {
With *w = ctx->withObject;
while (w) {
- if (PropertyDescriptor *pd = w->object->__getPropertyDescriptor__(this, name, &tmp))
- return pd->value;
+ if (w->object->__hasProperty__(ctx, name))
+ return w->object->__get__(ctx, name);
w = w->next;
}
}