summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@theqtcompany.com>2016-04-04 11:53:32 +0300
committerMiikka Heikkinen <miikka.heikkinen@theqtcompany.com>2016-04-05 08:40:15 +0000
commit35b800491709bafb58c3c8e29f953954f2a7897a (patch)
tree16a765c8a99940c4282dfeb1b727dc1f530c8c43
parentdf9206658a1d3e385c649fc35085bb50b487fb98 (diff)
Bump version to 2.1.1
Change-Id: If426ff4b1278b28afc7406fb42a7a6ad34aa725a Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
-rw-r--r--.qmake.conf2
-rw-r--r--README2
-rw-r--r--dist/changes-2.1.18
-rw-r--r--src/charts/qchartglobal.h4
4 files changed, 12 insertions, 4 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 07705596..b68682fe 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=2.1.1
diff --git a/README b/README
index ac6c27ef..59fb1467 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
---------------
-Qt Charts 2.1.0
+Qt Charts 2.1.1
---------------
Qt Charts module provides a set of easy to use chart components. It uses
diff --git a/dist/changes-2.1.1 b/dist/changes-2.1.1
new file mode 100644
index 00000000..caa3b1a1
--- /dev/null
+++ b/dist/changes-2.1.1
@@ -0,0 +1,8 @@
+Qt Charts 2.1.1
+
+Fixed issues
+------------
+- Fixed crash with empty BarSet values
+- Fixed model resetting with model mapper
+- Fixed crash when axis range is infinite
+- Fixed clearing the chart title
diff --git a/src/charts/qchartglobal.h b/src/charts/qchartglobal.h
index 5c082d84..2f6e35a2 100644
--- a/src/charts/qchartglobal.h
+++ b/src/charts/qchartglobal.h
@@ -24,11 +24,11 @@
#include <QtCore/QtGlobal>
-#define QT_CHARTS_VERSION_STR "2.1.0"
+#define QT_CHARTS_VERSION_STR "2.1.1"
/*
QT_CHARTS_VERSION is (major << 16) + (minor << 8) + patch.
*/
-#define QT_CHARTS_VERSION 0x020100
+#define QT_CHARTS_VERSION 0x020101
/*
can be used like #if (QT_CHARTS_VERSION >= QT_CHARTS_VERSION_CHECK(1, 1, 0))
*/