summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@nokia.com>2010-11-18 12:35:44 (GMT)
committerMarco Bubke <marco.bubke@nokia.com>2010-11-18 12:41:18 (GMT)
commit0ced71e4dddc12240b22fd5786ed41a529e49c47 (patch)
tree3db5051d8d59df635694ccbf611e0f91d44cfacb
parent36ac9c61e73944cd75d09f5751dd8ed053571b9b (diff)
downloadQt-0ced71e4dddc12240b22fd5786ed41a529e49c47.zip
Qt-0ced71e4dddc12240b22fd5786ed41a529e49c47.tar.gz
Qt-0ced71e4dddc12240b22fd5786ed41a529e49c47.tar.bz2
Fix parent bug for QDeclarativeOpenMetaObject
The dynamic meta object was not called because no parent meta object was called. Reviewed-By: Aaron Kennedy
-rw-r--r--src/declarative/util/qdeclarativeopenmetaobject.cpp2
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;
}