diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-12-10 05:59:23 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-12-10 05:59:23 (GMT) |
| commit | 1e51e44e094039b62b7f25f18511ce1a37b9efa1 (patch) | |
| tree | 2adb1070a474258582e18655464638682fa3baef | |
| parent | f9fc6217a5d51f7873bafa153189942f497baf2c (diff) | |
| parent | 643442d2c14b91fa5972c012f87f00054adb7d36 (diff) | |
| download | Qt-1e51e44e094039b62b7f25f18511ce1a37b9efa1.zip Qt-1e51e44e094039b62b7f25f18511ce1a37b9efa1.tar.gz Qt-1e51e44e094039b62b7f25f18511ce1a37b9efa1.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| -rw-r--r-- | src/declarative/util/qmlopenmetaobject.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/util/qmlopenmetaobject.cpp b/src/declarative/util/qmlopenmetaobject.cpp index 473d9d9..1b2c2bd 100644 --- a/src/declarative/util/qmlopenmetaobject.cpp +++ b/src/declarative/util/qmlopenmetaobject.cpp @@ -145,7 +145,9 @@ QmlOpenMetaObject::QmlOpenMetaObject(QObject *obj, QmlOpenMetaObjectType *type, d->autoCreate = automatic; d->object = obj; - d->type = type; +// d->type = type; + d->type = new QmlOpenMetaObjectType(0); + d->ownType = true; d->type->d->init(obj); QObjectPrivate *op = QObjectPrivate::get(obj); |