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>

1 files changed, 5 insertions, 9 deletions

diff --git a/tools/qmllint/componentversion.h b/tools/qmllint/componentversion.h
index 9c4604b9a3..bbb039fc40 100644
--- a/tools/qmllint/componentversion.h
+++ b/tools/qmllint/componentversion.h
@@ -40,24 +40,20 @@
 // We mean it.
 
 #include <QtCore/qglobal.h>
+#include <QtCore/qversionnumber.h>
 
 class ComponentVersion
 {
 public:
-    static const int NoVersion = -1;
-
     ComponentVersion() = default;
-    ComponentVersion(int major, int minor) : m_major(major), m_minor(minor) {}
+    ComponentVersion(QTypeRevision version) : m_version(version) {}
     explicit ComponentVersion(const QString &versionString);
 
-    int majorVersion() const { return m_major; }
-    int minorVersion() const { return m_minor; }
-
-    bool isValid() const { return m_major >= 0 && m_minor >= 0; }
+    QTypeRevision version() const { return m_version; }
+    bool isValid() const { return m_version.hasMajorVersion() && m_version.hasMinorVersion(); }
 
 private:
-    int m_major = NoVersion;
-    int m_minor = NoVersion;
+    QTypeRevision m_version;
 };
 
 bool operator<(const ComponentVersion &lhs, const ComponentVersion &rhs);