diff options
| author | Martin Jones <martin.jones@nokia.com> | 2012-06-22 16:56:27 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-25 04:50:01 +0200 |
| commit | e76ba402bfe309022a0be29c6bc8223f8f3f94b3 (patch) | |
| tree | 88f48d90e036f547d1f075feb99934a45d3fe0e7 /tests/auto/qml/qqmllanguage/testtypes.cpp | |
| parent | fd754674d04625ebf254ce2a96cbe39b3d7652d8 (diff) | |
qmlRegisterRevision clashes with qmlRegisterUncreatableType
Add template<typename T, int metaObjectRevision>
qmlRegisterUncreatableType() in order to register an uncreatable type
for a particular revision.
Task-number: QTBUG-23278
Change-Id: Ic165e41c8176916929cf19eb9bf6eef4b5bee1eb
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'tests/auto/qml/qqmllanguage/testtypes.cpp')
| -rw-r--r-- | tests/auto/qml/qqmllanguage/testtypes.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmllanguage/testtypes.cpp b/tests/auto/qml/qqmllanguage/testtypes.cpp index beb0f596ae..561300decf 100644 --- a/tests/auto/qml/qqmllanguage/testtypes.cpp +++ b/tests/auto/qml/qqmllanguage/testtypes.cpp @@ -83,6 +83,12 @@ void registerTypes() qmlRegisterType<MyEnumDerivedClass>("Test",1,0,"MyEnumDerivedClass"); qmlRegisterType<MyReceiversTestObject>("Test",1,0,"MyReceiversTestObject"); + + qmlRegisterUncreatableType<MyUncreateableBaseClass>("Test", 1, 0, "MyUncreateableBaseClass", "Cannot create MyUncreateableBaseClass"); + qmlRegisterType<MyCreateableDerivedClass>("Test", 1, 0, "MyCreateableDerivedClass"); + + qmlRegisterUncreatableType<MyUncreateableBaseClass,1>("Test", 1, 1, "MyUncreateableBaseClass", "Cannot create MyUncreateableBaseClass"); + qmlRegisterType<MyCreateableDerivedClass,1>("Test", 1, 1, "MyCreateableDerivedClass"); } QVariant myCustomVariantTypeConverter(const QString &data) |