aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmltypewrapper_p.h
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2013-08-08 12:52:56 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-08 15:35:18 +0200
commit0c179baade8f4a57c0f9fe7b48367412e8a41f2a (patch)
tree30c775eda2fcba23827bdfc7f5d4c042813b8a2e /src/qml/qml/qqmltypewrapper_p.h
parent5046e8898803ab3e83f4dae1260345fdba207a32 (diff)
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>
Diffstat (limited to 'src/qml/qml/qqmltypewrapper_p.h')
-rw-r--r--src/qml/qml/qqmltypewrapper_p.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/qml/qqmltypewrapper_p.h b/src/qml/qml/qqmltypewrapper_p.h
index ae70367dc4..944621b1d6 100644
--- a/src/qml/qml/qqmltypewrapper_p.h
+++ b/src/qml/qml/qqmltypewrapper_p.h
@@ -84,6 +84,7 @@ public:
static Value get(Managed *m, String *name, bool *hasProperty);
static void put(Managed *m, String *name, const Value &value);
+ static PropertyAttributes query(const Managed *, String *name);
static void destroy(Managed *that);
private: