From 203644bf28046c41bfaf4badec2f7c3dfa2c44a8 Mon Sep 17 00:00:00 2001
From: Arnold Dumas <arnold@dumas.at>
Date: Tue, 24 Jan 2017 14:33:03 +0100
Subject: [PATCH] Clang: ClangExecutableVersion is now a QVersionNumber

Change-Id: If1e1327ad54681ce6d8c59e2cee298ba7bd7996b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
---
 .../clangstaticanalyzerutils.h                | 24 ++++++-------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerutils.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzerutils.h
index dbccc365506..bf90e3a5a0f 100644
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerutils.h
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerutils.h
@@ -27,6 +27,7 @@
 
 #include <coreplugin/id.h>
 
+#include <QVersionNumber>
 #include <QtGlobal>
 
 QT_BEGIN_NAMESPACE
@@ -44,37 +45,26 @@ QString clangExecutableFromSettings(Core::Id toolchainType, bool *isValid);
 
 QString createFullLocationString(const Debugger::DiagnosticLocation &location);
 
-// TODO: Use QVersionNumber once we can use >= Qt 5.6.0
-class ClangExecutableVersion {
+class ClangExecutableVersion : public QVersionNumber {
 public:
-    ClangExecutableVersion() : majorNumber(-1) , minorNumber(-1) , patchNumber(-1) {}
-    ClangExecutableVersion(int major, int minor, int patch)
-        : majorNumber(major) , minorNumber(minor) , patchNumber(patch) {}
+    ClangExecutableVersion() : QVersionNumber(-1, -1, -1) {}
+    ClangExecutableVersion(int major, int minor, int micro)
+        : QVersionNumber(major, minor, micro) {}
 
     bool isValid() const
     {
-        return majorNumber >= 0 && minorNumber >= 0 && patchNumber >= 0;
+        return majorVersion() >= 0 && minorVersion() >= 0 && microVersion() >= 0;
     }
 
     bool isSupportedVersion() const
     {
-        return majorNumber == 3 && minorNumber == 9;
+        return majorVersion() == 3 && minorVersion() == 9;
     }
 
     static QString supportedVersionAsString()
     {
         return QLatin1String("3.9");
     }
-
-    QString toString() const
-    {
-        return QString::fromLatin1("%1.%2.%3").arg(majorNumber).arg(minorNumber).arg(patchNumber);
-    }
-
-public:
-    int majorNumber;
-    int minorNumber;
-    int patchNumber;
 };
 
 ClangExecutableVersion clangExecutableVersion(const QString &absolutePath);