diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-10-12 03:58:42 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-10-12 03:58:42 (GMT) |
| commit | 1ea93870fce7ff032053775fb19d42e950dd5ccb (patch) | |
| tree | ccdf099207d295b062a1abde307da3b5057e771a /src/declarative/qml/qmlcompileddata.cpp | |
| parent | 55e4d0591a2b18e08519144a416d1fea9a625cd8 (diff) | |
| download | Qt-1ea93870fce7ff032053775fb19d42e950dd5ccb.zip Qt-1ea93870fce7ff032053775fb19d42e950dd5ccb.tar.gz Qt-1ea93870fce7ff032053775fb19d42e950dd5ccb.tar.bz2 | |
Composite types should assign to object properties
Fixes QT-956
Diffstat (limited to 'src/declarative/qml/qmlcompileddata.cpp')
| -rw-r--r-- | src/declarative/qml/qmlcompileddata.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlcompileddata.cpp b/src/declarative/qml/qmlcompileddata.cpp index 8c3c355..7032a3b 100644 --- a/src/declarative/qml/qmlcompileddata.cpp +++ b/src/declarative/qml/qmlcompileddata.cpp @@ -150,7 +150,7 @@ int QmlCompiledData::indexForLocation(const QmlParser::LocationSpan &l) } QmlCompiledData::QmlCompiledData() -: importCache(0) +: importCache(0), root(0) { } @@ -189,7 +189,7 @@ const QMetaObject *QmlCompiledData::TypeReference::metaObject() const return type->metaObject(); } else { Q_ASSERT(component); - return &static_cast<QmlComponentPrivate *>(QObjectPrivate::get(component))->cc->root; + return static_cast<QmlComponentPrivate *>(QObjectPrivate::get(component))->cc->root; } } |