From 0a509b1b6d9bd0726a25c1236a5bab1d7e3c432f Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 4 Dec 2012 14:12:51 -0800 Subject: [PATCH] Use __get__, so that accessor properties work correctly Change-Id: I99f06c09017b50bffeb34a8158f0dbf902c75945 Reviewed-by: Simon Hausmann --- qmljs_environment.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qmljs_environment.cpp b/qmljs_environment.cpp index ca3c43b..0127b04 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; } } -- 2.7.4