diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2010-11-23 01:35:33 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2010-11-23 01:35:33 (GMT) |
| commit | 7d17956316ac786516f67ba9be511975ff42d898 (patch) | |
| tree | 7d5e4a31c710131742921f0dbce8fbd4285d99f5 /src/declarative/util | |
| parent | 280f67d16430ce0dcfcc31a0c88ce7156126066c (diff) | |
| parent | e158714ea545bd74600f121ab726cf2cf848f3b9 (diff) | |
| download | Qt-7d17956316ac786516f67ba9be511975ff42d898.zip Qt-7d17956316ac786516f67ba9be511975ff42d898.tar.gz Qt-7d17956316ac786516f67ba9be511975ff42d898.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qdeclarativeopenmetaobject.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/util/qdeclarativeopenmetaobject.cpp b/src/declarative/util/qdeclarativeopenmetaobject.cpp index 40485bd..c611435 100644 --- a/src/declarative/util/qdeclarativeopenmetaobject.cpp +++ b/src/declarative/util/qdeclarativeopenmetaobject.cpp @@ -186,6 +186,7 @@ QDeclarativeOpenMetaObject::QDeclarativeOpenMetaObject(QObject *obj, bool automa d->type->d->referers.insert(this); QObjectPrivate *op = QObjectPrivate::get(obj); + d->parent = static_cast<QAbstractDynamicMetaObject *>(op->metaObject); *static_cast<QMetaObject *>(this) = *d->type->d->mem; op->metaObject = this; } @@ -201,6 +202,7 @@ QDeclarativeOpenMetaObject::QDeclarativeOpenMetaObject(QObject *obj, QDeclarativ d->type->d->referers.insert(this); QObjectPrivate *op = QObjectPrivate::get(obj); + d->parent = static_cast<QAbstractDynamicMetaObject *>(op->metaObject); *static_cast<QMetaObject *>(this) = *d->type->d->mem; op->metaObject = this; } |