Add Composite Types to QQmlType
authorAlan Alpert <416365416c@gmail.com>
Mon, 17 Dec 2012 05:24:14 +0000 (21:24 -0800)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 18 Feb 2013 11:54:15 +0000 (12:54 +0100)
commit4d3a64c5e65a781acb4acf4ba641456da28bd1e4
tree10d1374401131a7d22146cdf7029307aea9efe7b
parent58471eb3f267dbee728b1c13f87458f2ee509bfa
Add Composite Types to QQmlType

When a composite type is loaded from a QML file, it now generates a
QQmlType entry in QQmlMetaTypeData.

Change-Id: I9b127dff7955456aacb25138fa6ea8efb7bb9221
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
Reviewed-by: Alan Alpert <aalpert@rim.com>
19 files changed:
src/qml/doc/src/documents/definetypes.qdoc
src/qml/qml/qqmlcompileddata.cpp
src/qml/qml/qqmlcompiler.cpp
src/qml/qml/qqmlengine.cpp
src/qml/qml/qqmlengine_p.h
src/qml/qml/qqmlimport.cpp
src/qml/qml/qqmlimport_p.h
src/qml/qml/qqmlmetatype.cpp
src/qml/qml/qqmlmetatype_p.h
src/qml/qml/qqmlprivate.h
src/qml/qml/qqmltypeloader.cpp
tests/auto/qml/qqmllanguage/data/CompositeType5.qml [new file with mode: 0644]
tests/auto/qml/qqmllanguage/data/CompositeType6.qml [new file with mode: 0644]
tests/auto/qml/qqmllanguage/data/assignCompositeToType.qml
tests/auto/qml/qqmlmetatype/data/CompositeType.qml [new file with mode: 0644]
tests/auto/qml/qqmlmetatype/data/ImplicitType.qml [new file with mode: 0644]
tests/auto/qml/qqmlmetatype/data/testImplicitComposite.qml [new file with mode: 0644]
tests/auto/qml/qqmlmetatype/qqmlmetatype.pro
tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp