Use QTypeRevision for all versions and revisions

In many places we carry major and minor versions or revisions that are
loosely coupled to minor versions. As the Qt minor version resets now,
we need to handle these things more systematically. In particular, we
need to add a "major" part to revisions.

QTypeRevision can express the current major/minor pairs more efficiently
and can also be used to add a major version to revisions. This change
does not change the semantics, yet, but only replaces the types.

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

5 files changed, 38 insertions, 21 deletions

diff --git a/src/qmltyperegistrar/qmltyperegistrar.cpp b/src/qmltyperegistrar/qmltyperegistrar.cpp
index 49c9fccb66..c22f349ea0 100644
--- a/src/qmltyperegistrar/qmltyperegistrar.cpp
+++ b/src/qmltyperegistrar/qmltyperegistrar.cpp
@@ -414,7 +414,7 @@ int main(int argc, char **argv)
     creator.setOwnTypes(std::move(types));
     creator.setForeignTypes(std::move(foreignTypes));
     creator.setModule(module);
-    creator.setMajorVersion(parser.value(majorVersionOption).toInt());
+    creator.setVersion(QTypeRevision::fromVersion(parser.value(majorVersionOption).toInt(), 0));
 
     creator.generate(parser.value(pluginTypesOption), parser.value(dependenciesOption));
     return EXIT_SUCCESS;
diff --git a/src/qmltyperegistrar/qmltypesclassdescription.cpp b/src/qmltyperegistrar/qmltypesclassdescription.cpp
index 15a8113ac8..aceab7c2b1 100644
--- a/src/qmltyperegistrar/qmltypesclassdescription.cpp
+++ b/src/qmltyperegistrar/qmltypesclassdescription.cpp
@@ -27,18 +27,19 @@
 ****************************************************************************/
 
 #include "qmltypesclassdescription.h"
+#include "qmltypescreator.h"
 
 #include <QtCore/qjsonarray.h>
 
 static void collectExtraVersions(const QJsonObject *component, const QString &key,
-                                 QList<int> &extraVersions)
+                                 QList<QTypeRevision> &extraVersions)
 {
     const QJsonArray &items = component->value(key).toArray();
     for (const QJsonValue &item : items) {
         const QJsonObject obj = item.toObject();
         const auto revision = obj.find(QLatin1String("revision"));
         if (revision != obj.end()) {
-            const int extraVersion = revision.value().toInt();
+            const auto extraVersion = QTypeRevision::fromEncodedVersion(revision.value().toInt());
             if (!extraVersions.contains(extraVersion))
                 extraVersions.append(extraVersion);
         }
@@ -72,11 +73,12 @@ void QmlTypesClassDescription::collect(const QJsonObject *classDef,
             if (defaultProp.isEmpty())
                 defaultProp = value;
         } else if (name == QLatin1String("QML.AddedInMinorVersion")) {
+            const QTypeRevision revision = QTypeRevision::fromEncodedVersion(value.toInt());
             if (topLevel) {
-                addedInRevision = value.toInt();
-                revisions.append(value.toInt());
+                addedInRevision = revision;
+                revisions.append(revision);
             } else if (!elementName.isEmpty()) {
-                revisions.append(value.toInt());
+                revisions.append(revision);
             }
         }
 
@@ -90,7 +92,7 @@ void QmlTypesClassDescription::collect(const QJsonObject *classDef,
             else if (value != QLatin1String("anonymous"))
                 elementName = value;
         } else if (name == QLatin1String("QML.RemovedInMinorVersion")) {
-            removedInRevision = value.toInt();
+            removedInRevision = QTypeRevision::fromEncodedVersion(value.toInt());
         } else if (name == QLatin1String("QML.Creatable")) {
             isCreatable = (value != QLatin1String("false"));
         } else if (name == QLatin1String("QML.Attached")) {
@@ -147,9 +149,9 @@ void QmlTypesClassDescription::collect(const QJsonObject *classDef,
         }
     }
 
-    if (addedInRevision == -1) {
-        revisions.append(0);
-        addedInRevision = 0;
+    if (!addedInRevision.isValid()) {
+        revisions.append(QTypeRevision::zero());
+        addedInRevision = QTypeRevision::zero();
     }
 
     std::sort(revisions.begin(), revisions.end());
diff --git a/src/qmltyperegistrar/qmltypesclassdescription.h b/src/qmltyperegistrar/qmltypesclassdescription.h
index 8f3a6ea124..8222016faf 100644
--- a/src/qmltyperegistrar/qmltypesclassdescription.h
+++ b/src/qmltyperegistrar/qmltypesclassdescription.h
@@ -33,6 +33,7 @@
 #include <QtCore/qjsonobject.h>
 #include <QtCore/qvector.h>
 #include <QtCore/qset.h>
+#include <QtCore/qversionnumber.h>
 
 struct QmlTypesClassDescription
 {
@@ -41,9 +42,9 @@ struct QmlTypesClassDescription
     QString defaultProp;
     QString superClass;
     QString attachedType;
-    QList<int> revisions;
-    int addedInRevision = -1;
-    int removedInRevision = -1;
+    QList<QTypeRevision> revisions;
+    QTypeRevision addedInRevision;
+    QTypeRevision removedInRevision;
     bool isCreatable = true;
     bool isSingleton = false;
     bool isRootClass = false;
diff --git a/src/qmltyperegistrar/qmltypescreator.cpp b/src/qmltyperegistrar/qmltypescreator.cpp
index 911120027e..8991ee42b6 100644
--- a/src/qmltyperegistrar/qmltypescreator.cpp
+++ b/src/qmltyperegistrar/qmltypescreator.cpp
@@ -35,6 +35,7 @@
 #include <QtCore/qsavefile.h>
 #include <QtCore/qfile.h>
 #include <QtCore/qjsondocument.h>
+#include <QtCore/qversionnumber.h>
 
 static QString enquote(const QString &string)
 {
@@ -63,13 +64,11 @@ void QmlTypesCreator::writeClassProperties(const QmlTypesClassDescription &colle
     QStringList metaObjects;
 
     for (auto it = collector.revisions.begin(), end = collector.revisions.end(); it != end; ++it) {
-        const int revision = *it;
+        const QTypeRevision revision = *it;
         if (revision < collector.addedInRevision)
             continue;
-        if (collector.removedInRevision > collector.addedInRevision
-                && revision >= collector.removedInRevision) {
+        if (collector.removedInRevision.isValid() && !(revision < collector.removedInRevision))
             break;
-        }
 
         if (collector.isBuiltin) {
             exports.append(enquote(QString::fromLatin1("QML/%1 1.0").arg(collector.elementName)));
@@ -78,8 +77,8 @@ void QmlTypesCreator::writeClassProperties(const QmlTypesClassDescription &colle
 
         exports.append(enquote(QString::fromLatin1("%1/%2 %3.%4")
                                            .arg(m_module).arg(collector.elementName)
-                                           .arg(m_majorVersion).arg(revision)));
-        metaObjects.append(QString::number(revision));
+                                           .arg(m_version.majorVersion()).arg(revision.minorVersion())));
+        metaObjects.append(QString::number(revision.toEncodedVersion<quint16>()));
     }
 
     m_qml.writeArrayBinding(QLatin1String("exports"), exports);
diff --git a/src/qmltyperegistrar/qmltypescreator.h b/src/qmltyperegistrar/qmltypescreator.h
index 9207a64b7e..2ef4e8ff4b 100644
--- a/src/qmltyperegistrar/qmltypescreator.h
+++ b/src/qmltyperegistrar/qmltypescreator.h
@@ -45,7 +45,7 @@ public:
     void setOwnTypes(QVector<QJsonObject> ownTypes) { m_ownTypes = std::move(ownTypes); }
     void setForeignTypes(QVector<QJsonObject> foreignTypes) { m_foreignTypes = std::move(foreignTypes); }
     void setModule(QString module) { m_module = std::move(module); }
-    void setMajorVersion(int majorVersion) { m_majorVersion = majorVersion; }
+    void setVersion(QTypeRevision version) { m_version = version; }
 
 private:
     void writeClassProperties(const QmlTypesClassDescription &collector);
@@ -62,7 +62,22 @@ private:
     QVector<QJsonObject> m_ownTypes;
     QVector<QJsonObject> m_foreignTypes;
     QString m_module;
-    int m_majorVersion = 0;
+    QTypeRevision m_version = QTypeRevision::zero();
 };
 
+QT_BEGIN_NAMESPACE
+
+// We cannot generally assume that the unspecified version is smaller than any specified one.
+// Therefore, this operator< should not move to QtCore.
+inline bool operator<(QTypeRevision lhs, QTypeRevision rhs)
+{
+    return lhs.hasMajorVersion()
+            ? (rhs.hasMajorVersion()
+               && lhs.toEncodedVersion<quint16>() < rhs.toEncodedVersion<quint16>())
+            : (rhs.hasMajorVersion()
+               || lhs.minorVersion() < rhs.minorVersion());
+}
+
+QT_END_NAMESPACE
+
 #endif // QMLTYPESCREATOR_H