Fix hasOwnProperty on various types wrapped in QML

* Change semantics of Object::query to not walk the prototype chain but let the
  caller do that where needed (__hasProperty__)
* Re-implement query in various places
* Implement method_hasOwnProperty to fall back to query() if getOwnProperty failed
* Fix missing prototype initialization in some qml wrappers, as well as missing base
  class calls to ::get()

Change-Id: Ic2a702fd5ff3be2ff3c8317a8a24f99940a9594f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 19 insertions, 0 deletions

diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp
index 05412e99a7..64baf8b1ce 100644
--- a/src/qml/qml/qqmlvaluetypewrapper.cpp
+++ b/src/qml/qml/qqmlvaluetypewrapper.cpp
@@ -201,6 +201,25 @@ bool QmlValueTypeWrapper::isEqualTo(Managed *m, Managed *other)
     return false;
 }
 
+PropertyAttributes QmlValueTypeWrapper::query(const Managed *m, String *name)
+{
+    const QmlValueTypeWrapper *r = m->as<const QmlValueTypeWrapper>();
+    QV4::ExecutionEngine *v4 = m->engine();
+    if (!r)
+        v4->current->throwTypeError();
+
+    QQmlPropertyData local;
+    QQmlPropertyData *result = 0;
+    {
+        QQmlData *ddata = QQmlData::get(r->type, false);
+        if (ddata && ddata->propertyCache)
+            result = ddata->propertyCache->property(name, 0, 0);
+        else
+            result = QQmlPropertyCache::property(r->v8->engine(), r->type, name, 0, local);
+    }
+    return result ? Attr_Data : Attr_Invalid;
+}
+
 bool QmlValueTypeWrapper::isEqual(const QVariant& value)
 {
     if (objectType == QmlValueTypeWrapper::Reference) {