Merge remote-tracking branch 'origin/dev' into wip/cmake

 Conflicts:
	dependencies.yaml
	src/qml/qml/qqmlengine.cpp

Change-Id: I6a73fd1064286f4a2232de85c2ce7f80452d4641

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);