Specify parameters of type registration in class declarations

Using this technique we can automatically register all necessary
revisions and minor versions of a type, using the metaobject system.
This greatly reduces the potential for mistakes and resulting
incompatibilities between versions of imports.

We assume that for each type we need to register all revisions of its
super types and its attached type, and that the revisions match. That
is, if you import version X of type A, you will also get version X of
its attached type and of any super types. As we previously didn't take
these dependencies into account when manually registering the types, a
number of extra revisions are now registered for some types.

Potentially, we can now generate the qmltypes files at compile time,
using moc.

Change-Id: I7abb8a5c39f5e63ad1a0cb41a783f2c91909491b
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

2 files changed, 6 insertions, 5 deletions

diff --git a/examples/qml/referenceexamples/grouped/main.cpp b/examples/qml/referenceexamples/grouped/main.cpp
index 4f4b828cef..e233aab5b1 100644
--- a/examples/qml/referenceexamples/grouped/main.cpp
+++ b/examples/qml/referenceexamples/grouped/main.cpp
@@ -58,11 +58,7 @@ int main(int argc, char ** argv)
 {
     QCoreApplication app(argc, argv);
 
-    qmlRegisterType<BirthdayParty>("People", 1,0, "BirthdayParty");
-    qmlRegisterAnonymousType<ShoeDescription>("People", 1);
-    qmlRegisterAnonymousType<Person>("People", 1);
-    qmlRegisterType<Boy>("People", 1,0, "Boy");
-    qmlRegisterType<Girl>("People", 1,0, "Girl");
+    qmlRegisterTypesAndRevisions<BirthdayParty, ShoeDescription, Person, Boy, Girl>("People", 1);
 
     QQmlEngine engine;
     QQmlComponent component(&engine, QUrl("qrc:example.qml"));
diff --git a/examples/qml/referenceexamples/grouped/person.h b/examples/qml/referenceexamples/grouped/person.h
index 6f6caaee7c..df507c7386 100644
--- a/examples/qml/referenceexamples/grouped/person.h
+++ b/examples/qml/referenceexamples/grouped/person.h
@@ -52,6 +52,7 @@
 
 #include <QObject>
 #include <QColor>
+#include <QtQml/qqml.h>
 
 class ShoeDescription : public QObject
 {
@@ -60,6 +61,7 @@ class ShoeDescription : public QObject
     Q_PROPERTY(QColor color READ color WRITE setColor)
     Q_PROPERTY(QString brand READ brand WRITE setBrand)
     Q_PROPERTY(qreal price READ price WRITE setPrice)
+    QML_ANONYMOUS
 public:
     ShoeDescription(QObject *parent = nullptr);
 
@@ -88,6 +90,7 @@ class Person : public QObject
 // ![1]
     Q_PROPERTY(ShoeDescription *shoe READ shoe)
 // ![1]
+    QML_ANONYMOUS
 public:
     Person(QObject *parent = nullptr);
 
@@ -103,6 +106,7 @@ private:
 class Boy : public Person
 {
     Q_OBJECT
+    QML_ELEMENT
 public:
     Boy(QObject * parent = nullptr);
 };
@@ -110,6 +114,7 @@ public:
 class Girl : public Person
 {
     Q_OBJECT
+    QML_ELEMENT
 public:
     Girl(QObject * parent = nullptr);
 };