diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-08-16 22:08:31 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-17 09:26:48 +0200 |
| commit | 900ff8ed90468fc89f4800c793dd3cde3e586d21 (patch) | |
| tree | 7c37d5247fa2078b4802f102073026b97fca89e3 /src | |
| parent | 0da208381f98ffd22790716a144aa5f22a5fd07e (diff) | |
Simplify __qmljs_call_property_lookup
This was still using the older (and slower) member of Lookup. Instead
call the function pointer to resolve the lookup.
Change-Id: I840b063ce4cc71f71be9be23ea7ce164887c2a91
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/jsruntime/qv4runtime.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp index 79bbbf6b2e..5dd4ef2e29 100644 --- a/src/qml/jsruntime/qv4runtime.cpp +++ b/src/qml/jsruntime/qv4runtime.cpp @@ -824,11 +824,8 @@ void __qmljs_call_property_lookup(ExecutionContext *context, Value *result, cons else baseObject = __qmljs_convert_to_object(context, thisObject); - PropertyAttributes attrs; - Property *p = l->lookup(baseObject, &attrs); - if (!p) - context->throwTypeError(); - Value func = attrs.isData() ? p->value : baseObject->getValue(p, attrs); + Value func; + l->getter(l, &func, Value::fromObject(baseObject)); FunctionObject *o = func.asFunctionObject(); if (!o) context->throwTypeError(); |