diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-10-12 06:56:50 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-10-12 06:56:50 (GMT) |
| commit | 7421702dd3202c21f3871171792476f0d2d50abe (patch) | |
| tree | 5a45e20fd74e23cf0a4ad2aa1a80bd073fa51413 /src/declarative/qml/qmlvmemetaobject_p.h | |
| parent | 9094a6588de3a7264ec4647a24b94253a7609823 (diff) | |
| parent | 949e21cdafeec0c0e4ac632ebbf21767479f04e5 (diff) | |
| download | Qt-7421702dd3202c21f3871171792476f0d2d50abe.zip Qt-7421702dd3202c21f3871171792476f0d2d50abe.tar.gz Qt-7421702dd3202c21f3871171792476f0d2d50abe.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlcompiler.cpp
Diffstat (limited to 'src/declarative/qml/qmlvmemetaobject_p.h')
| -rw-r--r-- | src/declarative/qml/qmlvmemetaobject_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlvmemetaobject_p.h b/src/declarative/qml/qmlvmemetaobject_p.h index 1c26241..d376f4c 100644 --- a/src/declarative/qml/qmlvmemetaobject_p.h +++ b/src/declarative/qml/qmlvmemetaobject_p.h @@ -104,6 +104,8 @@ public: QmlRefCount * = 0); ~QmlVMEMetaObject(); + void registerInterceptor(int index, QmlPropertyValueInterceptor *interceptor); + protected: virtual int metaCall(QMetaObject::Call _c, int _id, void **_a); @@ -117,6 +119,8 @@ private: QVariant *data; QBitArray aConnected; + QBitArray aInterceptors; + QHash<int, QmlPropertyValueInterceptor*> interceptors; QAbstractDynamicMetaObject *parent; |