add a simple Version class

This class replaces the Version struct in setup-qt and the
ImportVersion class of the loader.

Change-Id: Ic65eaf62de44ce0c082fe805431463defce1fe3b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/src/lib/corelib/language/itemreaderastvisitor.h b/src/lib/corelib/language/itemreaderastvisitor.h
index 5d12aac35..b92de888e 100644
--- a/src/lib/corelib/language/itemreaderastvisitor.h
+++ b/src/lib/corelib/language/itemreaderastvisitor.h
@@ -30,10 +30,12 @@
 #ifndef QBS_ITEMREADERASTVISITOR_H
 #define QBS_ITEMREADERASTVISITOR_H
 
-#include "importversion.h"
 #include "item.h"
 #include "filecontext.h"
+
 #include <parser/qmljsastvisitor_p.h>
+#include <tools/version.h>
+
 #include <QHash>
 
 namespace qbs {
@@ -59,6 +61,8 @@ public:
     bool visit(QbsQmlJS::AST::FunctionDeclaration *ast);
 
 private:
+    static Version readImportVersion(const QString &str,
+            const CodeLocation &location = CodeLocation());
     bool visitStatement(QbsQmlJS::AST::Statement *statement);
     CodeLocation toCodeLocation(const QbsQmlJS::AST::SourceLocation &location) const;
     void checkDuplicateBinding(Item *item, const QStringList &bindingName,
@@ -77,7 +81,7 @@ private:
 
     ItemReader *m_reader;
     ItemReaderResult *m_readerResult;
-    const ImportVersion m_languageVersion;
+    const Version m_languageVersion;
     FileContextPtr m_file;
     QHash<QStringList, QString> m_typeNameToFile;
     Item *m_item;