Process major versions as part of Q_REVISION

Retrieve the major version from the meta object revisions and use them
to register types and generate qmltypes files.

Change-Id: I35da8963457660d1a49ba9063574e1a68057a7ba
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 10 insertions, 8 deletions

diff --git a/src/qmltyperegistrar/qmltypescreator.cpp b/src/qmltyperegistrar/qmltypescreator.cpp
index 8991ee42b6..d34740eaa0 100644
--- a/src/qmltyperegistrar/qmltypescreator.cpp
+++ b/src/qmltyperegistrar/qmltypescreator.cpp
@@ -63,6 +63,11 @@ void QmlTypesCreator::writeClassProperties(const QmlTypesClassDescription &colle
     QStringList exports;
     QStringList metaObjects;
 
+    if (collector.isBuiltin) {
+        exports.append(enquote(QString::fromLatin1("QML/%1 1.0").arg(collector.elementName)));
+        metaObjects.append(QString::number(QTypeRevision::fromVersion(1, 0).toEncodedVersion<quint16>()));
+    }
+
     for (auto it = collector.revisions.begin(), end = collector.revisions.end(); it != end; ++it) {
         const QTypeRevision revision = *it;
         if (revision < collector.addedInRevision)
@@ -70,14 +75,11 @@ void QmlTypesCreator::writeClassProperties(const QmlTypesClassDescription &colle
         if (collector.removedInRevision.isValid() && !(revision < collector.removedInRevision))
             break;
 
-        if (collector.isBuiltin) {
-            exports.append(enquote(QString::fromLatin1("QML/%1 1.0").arg(collector.elementName)));
-            metaObjects.append(QLatin1String("0"));
-        }
-
         exports.append(enquote(QString::fromLatin1("%1/%2 %3.%4")
-                                           .arg(m_module).arg(collector.elementName)
-                                           .arg(m_version.majorVersion()).arg(revision.minorVersion())));
+                               .arg(m_module).arg(collector.elementName)
+                               .arg(revision.hasMajorVersion() ? revision.majorVersion()
+                                                               : m_version.majorVersion())
+                               .arg(revision.minorVersion())));
         metaObjects.append(QString::number(revision.toEncodedVersion<quint16>()));
     }
 
@@ -244,7 +246,7 @@ void QmlTypesCreator::writeComponents()
         m_qml.writeStartObject(componentElement);
 
         QmlTypesClassDescription collector;
-        collector.collect(&component, m_ownTypes, m_foreignTypes, true);
+        collector.collect(&component, m_ownTypes, m_foreignTypes, true, m_version);
 
         writeClassProperties(collector);