Fix a small bug in virtualHasProperty

It should call hasProperty() on the proto if the property
wasn't found locally, instead of looping and calling getOwnProperty,
as this leads to subtly differences with Proxy objects.

Change-Id: I088b0522c621999b7991f9194f46eaa9f6e15206
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 6 insertions, 5 deletions

diff --git a/src/qml/jsruntime/qv4object.cpp b/src/qml/jsruntime/qv4object.cpp
index cd9ea66297..c1f6642c9d 100644
--- a/src/qml/jsruntime/qv4object.cpp
+++ b/src/qml/jsruntime/qv4object.cpp
@@ -717,12 +717,13 @@ bool Object::virtualHasProperty(const Managed *m, PropertyKey id)
     Scope scope(m->engine());
     ScopedObject o(scope, m);
     ScopedProperty p(scope);
-    while (o) {
-        if (o->getOwnProperty(id, p) != Attr_Invalid)
-            return true;
 
-        o = o->getPrototypeOf();
-    }
+    if (o->getOwnProperty(id, p) != Attr_Invalid)
+        return true;
+
+    o = o->getPrototypeOf();
+    if (o)
+        return o->hasProperty(id);
 
     return false;
 }