Remove "All rights reserved" line from license headers.
[profile/ivi/qtdeclarative.git] / tests / auto / declarative / qdeclarativelanguage / testtypes.cpp
index cd74414..3c7a7c2 100644 (file)
@@ -1,8 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
@@ -35,6 +34,7 @@
 **
 **
 **
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -70,6 +70,13 @@ void registerTypes()
     qmlRegisterCustomType<MyCustomParserType>("Test", 1, 0, "MyCustomParserType", new MyCustomParserTypeParser);
 
     qmlRegisterTypeNotAvailable("Test",1,0,"UnavailableType", "UnavailableType is unavailable for testing");
+
+    qmlRegisterType<MyQmlObject>("Test.Version",1,0,"MyQmlObject");
+    qmlRegisterType<MyTypeObject>("Test.Version",1,0,"MyTypeObject");
+    qmlRegisterType<MyTypeObject>("Test.Version",2,0,"MyTypeObject");
+
+    qmlRegisterType<MyVersion2Class>("Test.VersionOrder", 2,0, "MyQmlObject");
+    qmlRegisterType<MyQmlObject>("Test.VersionOrder", 1,0, "MyQmlObject");
 }
 
 QVariant myCustomVariantTypeConverter(const QString &data)