summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.qmake.conf2
-rw-r--r--README2
-rw-r--r--dist/changes-1.2.26
-rw-r--r--src/datavisualization/doc/qtdatavisualization.qdocconf10
-rw-r--r--src/datavisualization/global/qdatavisualizationglobal.h4
5 files changed, 15 insertions, 9 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 4412217c..41298804 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,6 +1,6 @@
load(qt_build_config)
CONFIG += qt_example_installs
-MODULE_VERSION=1.2.1
+MODULE_VERSION=1.2.2
CMAKE_MODULE_TESTS=-
diff --git a/README b/README
index d17d0075..8dca8705 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
---------------------------
-Qt Data Visualization 1.2.1
+Qt Data Visualization 1.2.2
---------------------------
Qt Data Visualization module provides multiple graph types to visualize data in 3D space
diff --git a/dist/changes-1.2.2 b/dist/changes-1.2.2
new file mode 100644
index 00000000..a429f858
--- /dev/null
+++ b/dist/changes-1.2.2
@@ -0,0 +1,6 @@
+Qt Data Visualization 1.2.2
+
+Fixed issues
+------------
+
+- Compilation fixes for Qt 5.6
diff --git a/src/datavisualization/doc/qtdatavisualization.qdocconf b/src/datavisualization/doc/qtdatavisualization.qdocconf
index bdc25332..f38c965f 100644
--- a/src/datavisualization/doc/qtdatavisualization.qdocconf
+++ b/src/datavisualization/doc/qtdatavisualization.qdocconf
@@ -6,7 +6,7 @@ include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf)
project = QtDataVisualization
description = Qt Data Visualization Reference Documentation
-version = 1.2.1
+version = 1.2.2
exampledirs += ../../../examples/datavisualization \
snippets
@@ -27,14 +27,14 @@ indexes += $QT_INSTALL_DOCS/qtcore/qtcore.index \
qhp.projects = QtDataVisualization
qhp.QtDataVisualization.file = qtdatavisualization.qhp
-qhp.QtDataVisualization.namespace = com.digia.qtdatavisualization.121
+qhp.QtDataVisualization.namespace = com.digia.qtdatavisualization.122
qhp.QtDataVisualization.virtualFolder = qtdatavisualization
qhp.QtDataVisualization.indexTitle = Qt Data Visualization
qhp.QtDataVisualization.indexRoot =
-qhp.QtDataVisualization.filterAttributes = qtdatavisualization 1.2.1 qtrefdoc
-qhp.QtDataVisualization.customFilters.Qt.name = QtDataVisualization 1.2.1
-qhp.QtDataVisualization.customFilters.Qt.filterAttributes = qtdatavisualization 1.2.1
+qhp.QtDataVisualization.filterAttributes = qtdatavisualization 1.2.2 qtrefdoc
+qhp.QtDataVisualization.customFilters.Qt.name = QtDataVisualization 1.2.2
+qhp.QtDataVisualization.customFilters.Qt.filterAttributes = qtdatavisualization 1.2.2
qhp.QtDataVisualization.subprojects = gettingstarted examples classes types
qhp.QtDataVisualization.subprojects.gettingstarted.title = Getting Started
qhp.QtDataVisualization.subprojects.gettingstarted.indexTitle = Qt Data Visualization Getting Started
diff --git a/src/datavisualization/global/qdatavisualizationglobal.h b/src/datavisualization/global/qdatavisualizationglobal.h
index f22017f3..6b78e82c 100644
--- a/src/datavisualization/global/qdatavisualizationglobal.h
+++ b/src/datavisualization/global/qdatavisualizationglobal.h
@@ -21,11 +21,11 @@
#include <QtCore/qglobal.h>
-#define QT_DATAVISUALIZATION_VERSION_STR "1.2.1"
+#define QT_DATAVISUALIZATION_VERSION_STR "1.2.2"
/*
QT_DATAVISUALIZATION_VERSION is (major << 16) + (minor << 8) + patch.
*/
-#define QT_DATAVISUALIZATION_VERSION 0x010201
+#define QT_DATAVISUALIZATION_VERSION 0x010202
/*
can be used like #if (QT_DATAVISUALIZATION_VERSION >= QT_DATAVISUALIZATION_VERSION_CHECK(1, 0, 0))
*/