summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@theqtcompany.com>2016-01-14 17:27:20 +0200
committerMiikka Heikkinen <miikka.heikkinen@theqtcompany.com>2016-01-15 11:50:07 +0000
commit9965d437b2997c51ec7dd8a8daf7d34415c2ec09 (patch)
treea830c76c3395ea52edb7739bd37d150729e1d21e
parent87a5ca09e40239c0c87a375c4be2abe0d007215f (diff)
Update version number
Change-Id: I62c147fce40705f5c5c9ff83651602472bb7be0a 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--src/datavisualization/doc/qtdatavisualization.qdocconf10
-rw-r--r--src/datavisualization/global/qdatavisualizationglobal.h4
4 files changed, 9 insertions, 9 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 41298804..16c6edc3 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,6 +1,6 @@
load(qt_build_config)
CONFIG += qt_example_installs
-MODULE_VERSION=1.2.2
+MODULE_VERSION=5.7.0
CMAKE_MODULE_TESTS=-
diff --git a/README b/README
index 8dca8705..57052420 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
---------------------------
-Qt Data Visualization 1.2.2
+Qt Data Visualization 5.7.0
---------------------------
Qt Data Visualization module provides multiple graph types to visualize data in 3D space
diff --git a/src/datavisualization/doc/qtdatavisualization.qdocconf b/src/datavisualization/doc/qtdatavisualization.qdocconf
index f38c965f..db7c684a 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.2
+version = $QT_VERSION
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.122
+qhp.QtDataVisualization.namespace = com.digia.qtdatavisualization.$QT_VERSION_TAG
qhp.QtDataVisualization.virtualFolder = qtdatavisualization
qhp.QtDataVisualization.indexTitle = Qt Data Visualization
qhp.QtDataVisualization.indexRoot =
-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.filterAttributes = qtdatavisualization $QT_VERSION qtrefdoc
+qhp.QtDataVisualization.customFilters.Qt.name = QtDataVisualization $QT_VERSION
+qhp.QtDataVisualization.customFilters.Qt.filterAttributes = qtdatavisualization $QT_VERSION
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 afe6bfc3..da80d908 100644
--- a/src/datavisualization/global/qdatavisualizationglobal.h
+++ b/src/datavisualization/global/qdatavisualizationglobal.h
@@ -32,11 +32,11 @@
#include <QtCore/qglobal.h>
-#define QT_DATAVISUALIZATION_VERSION_STR "1.2.2"
+#define QT_DATAVISUALIZATION_VERSION_STR QT_VERSION_STR
/*
QT_DATAVISUALIZATION_VERSION is (major << 16) + (minor << 8) + patch.
*/
-#define QT_DATAVISUALIZATION_VERSION 0x010202
+#define QT_DATAVISUALIZATION_VERSION QT_VERSION
/*
can be used like #if (QT_DATAVISUALIZATION_VERSION >= QT_DATAVISUALIZATION_VERSION_CHECK(1, 0, 0))
*/