diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-11-23 14:49:41 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-11-23 14:49:41 (GMT) |
| commit | d0694162b872befc8c57dbf900bbd502ce25b80d (patch) | |
| tree | cb078d538f9df9ae5dbcbd647b6010604a744fac /src/declarative/util | |
| parent | 3dc88a6229afc72125fa5565eb565a6fbc92620f (diff) | |
| parent | cfc1e1c3687d7ad1ddf4b5650d06bf52de4e3576 (diff) | |
| download | Qt-d0694162b872befc8c57dbf900bbd502ce25b80d.zip Qt-d0694162b872befc8c57dbf900bbd502ce25b80d.tar.gz Qt-d0694162b872befc8c57dbf900bbd502ce25b80d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
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; } |