diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2010-11-29 06:39:31 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2010-11-29 06:39:31 (GMT) |
| commit | 4592fc2e481b42bbbe1f59e575ce3c9b9af9c9e4 (patch) | |
| tree | 9adb0250ed390477e37741de97bede2bae148f7e /src/declarative/util/qdeclarativeopenmetaobject.cpp | |
| parent | f7d66442963e1380a4f2db3d24cb24aa9d5c63ad (diff) | |
| parent | bf5571b485420a945e9fdf3bf5b31cfe4c4d482b (diff) | |
| download | Qt-4592fc2e481b42bbbe1f59e575ce3c9b9af9c9e4.zip Qt-4592fc2e481b42bbbe1f59e575ce3c9b9af9c9e4.tar.gz Qt-4592fc2e481b42bbbe1f59e575ce3c9b9af9c9e4.tar.bz2 | |
Merge remote branch 'origin/master' into lighthouse-master
Diffstat (limited to 'src/declarative/util/qdeclarativeopenmetaobject.cpp')
| -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; } |