diff options
| author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-04-14 13:39:06 +0300 |
|---|---|---|
| committer | Mika Salmela <mika.salmela@theqtcompany.com> | 2015-04-14 14:21:03 +0300 |
| commit | 916d67d2664b0262cd03b28ad0c694924dd09b13 (patch) | |
| tree | 19f8f355a85a913a194cf610731ceebd8d8fb643 | |
| parent | 273bae38cf4f9b0234839ce1a0443ce5ea4e1066 (diff) | |
Add dist file for 1.2.1 and change version numbers
Change-Id: Ia6bd240a8737fe9dbb6bf2d019cb032c7b60a874
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | dist/changes-1.2.1 | 9 | ||||
| -rw-r--r-- | src/datavisualization/doc/qtdatavisualization.qdocconf | 10 | ||||
| -rw-r--r-- | src/datavisualization/global/qdatavisualizationglobal.h | 4 |
5 files changed, 18 insertions, 9 deletions
diff --git a/.qmake.conf b/.qmake.conf index 48e733ed..4412217c 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,6 +1,6 @@ load(qt_build_config) CONFIG += qt_example_installs -MODULE_VERSION=1.2.0 +MODULE_VERSION=1.2.1 CMAKE_MODULE_TESTS=- @@ -1,5 +1,5 @@ --------------------------- -Qt Data Visualization 1.2.0 +Qt Data Visualization 1.2.1 --------------------------- Qt Data Visualization module provides multiple graph types to visualize data in 3D space diff --git a/dist/changes-1.2.1 b/dist/changes-1.2.1 new file mode 100644 index 00000000..33d19fdf --- /dev/null +++ b/dist/changes-1.2.1 @@ -0,0 +1,9 @@ +Qt Data Visualization 1.2.1 + +Fixed issues +------------ + +Examples: +- Fixed compilation error on customproxy example. +- Fixed default size of qmlscatter example. +- Fixed the image format in volumetric example layer images. diff --git a/src/datavisualization/doc/qtdatavisualization.qdocconf b/src/datavisualization/doc/qtdatavisualization.qdocconf index 4d63b526..bdc25332 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.0 +version = 1.2.1 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.120 +qhp.QtDataVisualization.namespace = com.digia.qtdatavisualization.121 qhp.QtDataVisualization.virtualFolder = qtdatavisualization qhp.QtDataVisualization.indexTitle = Qt Data Visualization qhp.QtDataVisualization.indexRoot = -qhp.QtDataVisualization.filterAttributes = qtdatavisualization 1.2.0 qtrefdoc -qhp.QtDataVisualization.customFilters.Qt.name = QtDataVisualization 1.2.0 -qhp.QtDataVisualization.customFilters.Qt.filterAttributes = qtdatavisualization 1.2.0 +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.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 66e5f8f5..f22017f3 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.0" +#define QT_DATAVISUALIZATION_VERSION_STR "1.2.1" /* QT_DATAVISUALIZATION_VERSION is (major << 16) + (minor << 8) + patch. */ -#define QT_DATAVISUALIZATION_VERSION 0x010200 +#define QT_DATAVISUALIZATION_VERSION 0x010201 /* can be used like #if (QT_DATAVISUALIZATION_VERSION >= QT_DATAVISUALIZATION_VERSION_CHECK(1, 0, 0)) */ |