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/qmlengine.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/qmlengine.cpp')
| -rw-r--r-- | src/declarative/qml/qmlengine.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index c644ccc..245ddc0 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -1379,7 +1379,7 @@ static void *voidptr_constructor(const void *v) void QmlEnginePrivate::registerCompositeType(QmlCompiledData *data) { - QByteArray name = data->root.className(); + QByteArray name = data->root->className(); QByteArray ptr = name + "*"; QByteArray lst = "QmlList<" + ptr + ">*"; @@ -1417,7 +1417,7 @@ const QMetaObject *QmlEnginePrivate::rawMetaObjectForType(int t) const { QHash<int, QmlCompiledData*>::ConstIterator iter = m_compositeTypes.find(t); if (iter != m_compositeTypes.end()) { - return &(*iter)->root; + return (*iter)->root; } else { return QmlMetaType::rawMetaObjectForType(t); } @@ -1427,7 +1427,7 @@ const QMetaObject *QmlEnginePrivate::metaObjectForType(int t) const { QHash<int, QmlCompiledData*>::ConstIterator iter = m_compositeTypes.find(t); if (iter != m_compositeTypes.end()) { - return &(*iter)->root; + return (*iter)->root; } else { return QmlMetaType::metaObjectForType(t); } |