From 18b5962194a7d4b32362957ed2fc3cb6f5c383ba 2016-01-15 11:50:10
From: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Date: 2016-01-15 11:50:10
Subject: [PATCH] Fix version numbers

QML API version was only updated to what it actually is, it
doesn't need to follow the module version.

Change-Id: I5c26da72b03a1e6858327a8a08f933998991c39e
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

---

diff --git a/.qmake.conf b/.qmake.conf
index 0770559..ddabfea 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,4 +1,4 @@
 load(qt_build_config)
 CONFIG += qt_example_installs
 
-MODULE_VERSION=2.1.0
+MODULE_VERSION=5.7.0
diff --git a/README b/README
index ac6c27e..1b136a3 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 ---------------
-Qt Charts 2.1.0
+Qt Charts 5.7.0
 ---------------
 
 Qt Charts module provides a set of easy to use chart components. It uses
diff --git a/src/charts/doc/qtcharts.qdocconf b/src/charts/doc/qtcharts.qdocconf
index c88007b..8345bf6 100644
--- a/src/charts/doc/qtcharts.qdocconf
+++ b/src/charts/doc/qtcharts.qdocconf
@@ -6,7 +6,7 @@ include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf)
 
 project = QtCharts
 description = Qt Charts Reference Documentation
-version = 2.1.0
+version = $QT_VERSION
 
 sourcedirs += .. \
               ../../chartsqml2
@@ -32,14 +32,14 @@ Cpp.ignoretokens        = Q_INVOKABLE \
 
 qhp.projects                  = QtCharts
 qhp.QtCharts.file             = qtcharts.qhp
-qhp.QtCharts.namespace        = com.digia.qtcharts.210
+qhp.QtCharts.namespace        = com.digia.qtcharts.$QT_VERSION_TAG
 qhp.QtCharts.virtualFolder    = qtcharts
 qhp.QtCharts.indexTitle       = Qt Charts
 qhp.QtCharts.indexRoot        =
 
-qhp.QtCharts.filterAttributes                  = qtcharts 2.1.0 qtrefdoc
-qhp.QtCharts.customFilters.Qt.name             = QtCharts 2.1.0
-qhp.QtCharts.customFilters.Qt.filterAttributes = qtcharts 2.1.0
+qhp.QtCharts.filterAttributes                  = qtcharts $QT_VERSION qtrefdoc
+qhp.QtCharts.customFilters.Qt.name             = QtCharts $QT_VERSION
+qhp.QtCharts.customFilters.Qt.filterAttributes = qtcharts $QT_VERSION
 
 qhp.QtCharts.subprojects = gettingstarted classes types examples
 
diff --git a/src/charts/doc/src/qtcharts.qdoc b/src/charts/doc/src/qtcharts.qdoc
index cf386d2..a0c0cf5 100644
--- a/src/charts/doc/src/qtcharts.qdoc
+++ b/src/charts/doc/src/qtcharts.qdoc
@@ -50,7 +50,7 @@
 */
 
 /*!
-    \qmlmodule QtCharts 2.0
+    \qmlmodule QtCharts 2.1
     \title Qt Charts QML Types
     \ingroup qmlmodules
 
diff --git a/src/charts/qchartglobal.h b/src/charts/qchartglobal.h
index 823b9ec..1c4a668 100644
--- a/src/charts/qchartglobal.h
+++ b/src/charts/qchartglobal.h
@@ -32,11 +32,11 @@
 
 #include <QtCore/QtGlobal>
 
-#define QT_CHARTS_VERSION_STR   "2.1.0"
+#define QT_CHARTS_VERSION_STR QT_VERSION_STR
 /*
    QT_CHARTS_VERSION is (major << 16) + (minor << 8) + patch.
 */
-#define QT_CHARTS_VERSION       0x020100
+#define QT_CHARTS_VERSION QT_VERSION
 /*
    can be used like #if (QT_CHARTS_VERSION >= QT_CHARTS_VERSION_CHECK(1, 1, 0))
 */