##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Fix version numbers...
Miikka Heikkinen -
r2858:18b5962194a7
parent child
Show More
Side by Side Unified
Context file:
r2858:18b5962194a7 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,4 +1,4
1 load(qt_build_config)
1 load(qt_build_config)
2 CONFIG += qt_example_installs
2 CONFIG += qt_example_installs
3
3
4 MODULE_VERSION=2.1.0
4 MODULE_VERSION=5.7.0
Show file before | Show file after | Hide comments
@@ -1,5 +1,5
1 ---------------
1 ---------------
2 Qt Charts 2.1.0
2 Qt Charts 5.7.0
3 ---------------
3 ---------------
4
4
5 Qt Charts module provides a set of easy to use chart components. It uses
5 Qt Charts module provides a set of easy to use chart components. It uses
Show file before | Show file after | Hide comments
@@ -6,7 +6,7 include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf)
6
6
7 project = QtCharts
7 project = QtCharts
8 description = Qt Charts Reference Documentation
8 description = Qt Charts Reference Documentation
9 version = 2.1.0
9 version = $QT_VERSION
10
10
11 sourcedirs += .. \
11 sourcedirs += .. \
12 ../../chartsqml2
12 ../../chartsqml2
@@ -32,14 +32,14 Cpp.ignoretokens = Q_INVOKABLE \
32
32
33 qhp.projects = QtCharts
33 qhp.projects = QtCharts
34 qhp.QtCharts.file = qtcharts.qhp
34 qhp.QtCharts.file = qtcharts.qhp
35 qhp.QtCharts.namespace = com.digia.qtcharts.210
35 qhp.QtCharts.namespace = com.digia.qtcharts.$QT_VERSION_TAG
36 qhp.QtCharts.virtualFolder = qtcharts
36 qhp.QtCharts.virtualFolder = qtcharts
37 qhp.QtCharts.indexTitle = Qt Charts
37 qhp.QtCharts.indexTitle = Qt Charts
38 qhp.QtCharts.indexRoot =
38 qhp.QtCharts.indexRoot =
39
39
40 qhp.QtCharts.filterAttributes = qtcharts 2.1.0 qtrefdoc
40 qhp.QtCharts.filterAttributes = qtcharts $QT_VERSION qtrefdoc
41 qhp.QtCharts.customFilters.Qt.name = QtCharts 2.1.0
41 qhp.QtCharts.customFilters.Qt.name = QtCharts $QT_VERSION
42 qhp.QtCharts.customFilters.Qt.filterAttributes = qtcharts 2.1.0
42 qhp.QtCharts.customFilters.Qt.filterAttributes = qtcharts $QT_VERSION
43
43
44 qhp.QtCharts.subprojects = gettingstarted classes types examples
44 qhp.QtCharts.subprojects = gettingstarted classes types examples
45
45
Show file before | Show file after | Hide comments
@@ -50,7 +50,7
50 */
50 */
51
51
52 /*!
52 /*!
53 \qmlmodule QtCharts 2.0
53 \qmlmodule QtCharts 2.1
54 \title Qt Charts QML Types
54 \title Qt Charts QML Types
55 \ingroup qmlmodules
55 \ingroup qmlmodules
56
56
Show file before | Show file after | Hide comments
@@ -32,11 +32,11
32
32
33 #include <QtCore/QtGlobal>
33 #include <QtCore/QtGlobal>
34
34
35 #define QT_CHARTS_VERSION_STR "2.1.0"
35 #define QT_CHARTS_VERSION_STR QT_VERSION_STR
36 /*
36 /*
37 QT_CHARTS_VERSION is (major << 16) + (minor << 8) + patch.
37 QT_CHARTS_VERSION is (major << 16) + (minor << 8) + patch.
38 */
38 */
39 #define QT_CHARTS_VERSION 0x020100
39 #define QT_CHARTS_VERSION QT_VERSION
40 /*
40 /*
41 can be used like #if (QT_CHARTS_VERSION >= QT_CHARTS_VERSION_CHECK(1, 1, 0))
41 can be used like #if (QT_CHARTS_VERSION >= QT_CHARTS_VERSION_CHECK(1, 1, 0))
42 */
42 */
General Comments 0
You need to be logged in to leave comments. Login now