diff options
| author | Alan Alpert <416365416c@gmail.com> | 2012-12-16 21:24:14 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-18 12:54:15 +0100 |
| commit | 4d3a64c5e65a781acb4acf4ba641456da28bd1e4 (patch) | |
| tree | 10d1374401131a7d22146cdf7029307aea9efe7b /tests/auto/qml/qqmlmetatype/data | |
| parent | 58471eb3f267dbee728b1c13f87458f2ee509bfa (diff) | |
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>
Diffstat (limited to 'tests/auto/qml/qqmlmetatype/data')
| -rw-r--r-- | tests/auto/qml/qqmlmetatype/data/CompositeType.qml | 5 | ||||
| -rw-r--r-- | tests/auto/qml/qqmlmetatype/data/ImplicitType.qml | 5 | ||||
| -rw-r--r-- | tests/auto/qml/qqmlmetatype/data/testImplicitComposite.qml | 3 |
3 files changed, 13 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmlmetatype/data/CompositeType.qml b/tests/auto/qml/qqmlmetatype/data/CompositeType.qml new file mode 100644 index 0000000000..bc2abca42b --- /dev/null +++ b/tests/auto/qml/qqmlmetatype/data/CompositeType.qml @@ -0,0 +1,5 @@ +import QtQml 2.0 + +QtObject { + property int foo +} diff --git a/tests/auto/qml/qqmlmetatype/data/ImplicitType.qml b/tests/auto/qml/qqmlmetatype/data/ImplicitType.qml new file mode 100644 index 0000000000..ca2bcef5bf --- /dev/null +++ b/tests/auto/qml/qqmlmetatype/data/ImplicitType.qml @@ -0,0 +1,5 @@ +import QtQml 2.0 + +QtObject { + property int bar +} diff --git a/tests/auto/qml/qqmlmetatype/data/testImplicitComposite.qml b/tests/auto/qml/qqmlmetatype/data/testImplicitComposite.qml new file mode 100644 index 0000000000..f838c6995f --- /dev/null +++ b/tests/auto/qml/qqmlmetatype/data/testImplicitComposite.qml @@ -0,0 +1,3 @@ +import "." + +ImplicitType{} |