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, 3 deletions

diff --git a/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp b/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp
index bc4ba9437c..db79adac6c 100644
--- a/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp
+++ b/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp
@@ -94,7 +94,8 @@ namespace {
     QString toString(const QQmlDirParser::Component &c)
     {
         return c.typeName + QLatin1Char('|') + c.fileName + QLatin1Char('|')
-            + QString::number(c.majorVersion) + QLatin1Char('|') + QString::number(c.minorVersion)
+            + QString::number(c.version.majorVersion()) + QLatin1Char('|')
+            + QString::number(c.version.minorVersion())
             + QLatin1Char('|') + (c.internal ? "true" : "false");
     }
 
@@ -112,7 +113,8 @@ namespace {
     QString toString(const QQmlDirParser::Script &s)
     {
         return s.nameSpace + QLatin1Char('|') + s.fileName + QLatin1Char('|')
-            + QString::number(s.majorVersion) + '|' + QString::number(s.minorVersion);
+            + QString::number(s.version.majorVersion()) + '|'
+            + QString::number(s.version.minorVersion());
     }
 
     QStringList toStringList(const QList<QQmlDirParser::Script> &scripts)
@@ -248,7 +250,7 @@ void tst_qqmldirparser::parse_data()
         << "unversioned-component/qmldir"
         << QStringList()
         << QStringList()
-        << (QStringList() << "foo|bar|-1|-1|false")
+        << (QStringList() << "foo|bar|255|255|false")
         << QStringList()
         << QStringList()
         << false;