diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-29 03:08:38 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-29 03:08:38 (GMT) |
commit | ea6ce9d455dce0518a6c8f633214ce5117cdfcd7 (patch) | |
tree | 0de0c093ec850109ae190aa3730a6f29a12fa7b0 /src/declarative/util/qdeclarativeopenmetaobject.cpp | |
parent | eac3500387fcd966e936cbe16b75db6cf9df3abe (diff) | |
parent | cc4a21c61d6d68ce49c2b8755e0edfb9571a0306 (diff) | |
download | Qt-ea6ce9d455dce0518a6c8f633214ce5117cdfcd7.zip Qt-ea6ce9d455dce0518a6c8f633214ce5117cdfcd7.tar.gz Qt-ea6ce9d455dce0518a6c8f633214ce5117cdfcd7.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/util/qdeclarativeopenmetaobject.cpp')
-rw-r--r-- | src/declarative/util/qdeclarativeopenmetaobject.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/declarative/util/qdeclarativeopenmetaobject.cpp b/src/declarative/util/qdeclarativeopenmetaobject.cpp index 8c23354..70ecf95 100644 --- a/src/declarative/util/qdeclarativeopenmetaobject.cpp +++ b/src/declarative/util/qdeclarativeopenmetaobject.cpp @@ -225,6 +225,7 @@ int QDeclarativeOpenMetaObject::metaCall(QMetaObject::Call c, int id, void **a) if (d->data[propId].first != *reinterpret_cast<QVariant *>(a[0])) { propertyWrite(propId); d->writeData(propId, *reinterpret_cast<QVariant *>(a[0])); + propertyWritten(propId); activate(d->object, d->type->d->signalOffset + propId, 0); } } @@ -270,6 +271,11 @@ QVariant &QDeclarativeOpenMetaObject::operator[](const QByteArray &name) return d->getData(*iter); } +QVariant &QDeclarativeOpenMetaObject::operator[](int id) +{ + return d->getData(id); +} + void QDeclarativeOpenMetaObject::setValue(const QByteArray &name, const QVariant &val) { QHash<QByteArray, int>::ConstIterator iter = d->type->d->names.find(name); @@ -326,6 +332,10 @@ void QDeclarativeOpenMetaObject::propertyWrite(int) { } +void QDeclarativeOpenMetaObject::propertyWritten(int) +{ +} + void QDeclarativeOpenMetaObject::propertyCreated(int, QMetaPropertyBuilder &) { } |