From 336e6534e2dce94d99a60932ebdb35b55011d4be 2015-09-11 10:07:16
From: Titta Heikkala <titta.heikkala@theqtcompany.com>
Date: 2015-09-11 10:07:16
Subject: [PATCH] Added dist file for 2.1.0 and changed version numbers

Added placeholder dist file for 2.1.0. Updated version numbers to 2.1.0.

Change-Id: Ia2fc30c38c2467d613158b7af4392aa5298d2171
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

---

diff --git a/.qmake.conf b/.qmake.conf
index 30dcb90..0770559 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,4 +1,4 @@
 load(qt_build_config)
 CONFIG += qt_example_installs
 
-MODULE_VERSION=2.0.0
+MODULE_VERSION=2.1.0
diff --git a/README b/README
index d553fb8..ac6c27e 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 ---------------
-Qt Charts 2.0.1
+Qt Charts 2.1.0
 ---------------
 
 Qt Charts module provides a set of easy to use chart components. It uses
diff --git a/dist/changes-2.1.0 b/dist/changes-2.1.0
new file mode 100644
index 0000000..a837356
--- /dev/null
+++ b/dist/changes-2.1.0
@@ -0,0 +1,9 @@
+Qt Charts 2.1.0
+
+New features
+------------
+- ?
+
+Fixed issues
+------------
+- ?
diff --git a/src/charts/doc/qtcharts.qdocconf b/src/charts/doc/qtcharts.qdocconf
index 275c25b..c88007b 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.0.1
+version = 2.1.0
 
 sourcedirs += .. \
               ../../chartsqml2
@@ -32,14 +32,14 @@ Cpp.ignoretokens        = Q_INVOKABLE \
 
 qhp.projects                  = QtCharts
 qhp.QtCharts.file             = qtcharts.qhp
-qhp.QtCharts.namespace        = com.digia.qtcharts.201
+qhp.QtCharts.namespace        = com.digia.qtcharts.210
 qhp.QtCharts.virtualFolder    = qtcharts
 qhp.QtCharts.indexTitle       = Qt Charts
 qhp.QtCharts.indexRoot        =
 
-qhp.QtCharts.filterAttributes                  = qtcharts 2.0.1 qtrefdoc
-qhp.QtCharts.customFilters.Qt.name             = QtCharts 2.0.1
-qhp.QtCharts.customFilters.Qt.filterAttributes = qtcharts 2.0.1
+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.subprojects = gettingstarted classes types examples
 
diff --git a/src/charts/qchartglobal.h b/src/charts/qchartglobal.h
index 012dbc6..b52c16b 100644
--- a/src/charts/qchartglobal.h
+++ b/src/charts/qchartglobal.h
@@ -21,11 +21,11 @@
 
 #include <QtCore/QtGlobal>
 
-#define QT_CHARTS_VERSION_STR   "2.0.1"
+#define QT_CHARTS_VERSION_STR   "2.1.0"
 /*
    QT_CHARTS_VERSION is (major << 16) + (minor << 8) + patch.
 */
-#define QT_CHARTS_VERSION       0x020001
+#define QT_CHARTS_VERSION       0x020100
 /*
    can be used like #if (QT_CHARTS_VERSION >= QT_CHARTS_VERSION_CHECK(1, 1, 0))
 */