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

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

Added dist file for 2.1.0 and changed version numbers...
Titta Heikkala -
r2808:336e6534e2dc
parent child
Show More
Side by Side Unified
Context file:
r2808:336e6534e2dc Loading diff...:
Show file before | Show file after | Hide comments
@@ -0,0 +1,9
1 Qt Charts 2.1.0
2
3 New features
4 ------------
5 - ?
6
7 Fixed issues
8 ------------
9 - ?
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.0.0
4 MODULE_VERSION=2.1.0
Show file before | Show file after | Hide comments
@@ -1,78 +1,78
1 ---------------
1 ---------------
2 Qt Charts 2.0.1
2 Qt Charts 2.1.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
6 the Qt Graphics View Framework, therefore charts can be easily integrated
6 the Qt Graphics View Framework, therefore charts can be easily integrated
7 to modern user interfaces.
7 to modern user interfaces.
8
8
9 System Requirements
9 System Requirements
10 ===================
10 ===================
11
11
12 - Qt 5.4 or newer
12 - Qt 5.4 or newer
13 - For QML applications QtQuick 2 is required
13 - For QML applications QtQuick 2 is required
14 - Manipulating Qt Charts graphs with QML Designer requires Qt Creator 3.3 or newer
14 - Manipulating Qt Charts graphs with QML Designer requires Qt Creator 3.3 or newer
15
15
16 Building
16 Building
17 ========
17 ========
18
18
19 Configure the project with qmake:
19 Configure the project with qmake:
20 qmake
20 qmake
21
21
22 After running qmake, build the project with make:
22 After running qmake, build the project with make:
23 (Linux) make
23 (Linux) make
24 (Windows with MinGw) mingw32-make
24 (Windows with MinGw) mingw32-make
25 (Windows with Visual Studio) nmake
25 (Windows with Visual Studio) nmake
26 (OS X) make
26 (OS X) make
27
27
28 The above generates the default makefiles for your configuration, which is typically
28 The above generates the default makefiles for your configuration, which is typically
29 the release build if you are using precompiled binary Qt distribution. To build both
29 the release build if you are using precompiled binary Qt distribution. To build both
30 debug and release, or one specifically, use one of the following qmake lines instead.
30 debug and release, or one specifically, use one of the following qmake lines instead.
31
31
32 For debug builds:
32 For debug builds:
33 qmake CONFIG+=debug
33 qmake CONFIG+=debug
34 make
34 make
35 or
35 or
36 qmake CONFIG+=debug_and_release
36 qmake CONFIG+=debug_and_release
37 make debug
37 make debug
38
38
39 For release builds:
39 For release builds:
40 qmake CONFIG+=release
40 qmake CONFIG+=release
41 make
41 make
42 or
42 or
43 qmake CONFIG+=debug_and_release
43 qmake CONFIG+=debug_and_release
44 make release
44 make release
45
45
46 For both builds (Windows/OS X only):
46 For both builds (Windows/OS X only):
47 qmake CONFIG+="debug_and_release build_all"
47 qmake CONFIG+="debug_and_release build_all"
48 make
48 make
49
49
50 After building, install the module to your Qt directory:
50 After building, install the module to your Qt directory:
51 make install
51 make install
52
52
53 If you want to uninstall the module:
53 If you want to uninstall the module:
54 make uninstall
54 make uninstall
55
55
56 Building as a statically linked library
56 Building as a statically linked library
57 =======================================
57 =======================================
58
58
59 The same as above applies, you will just have to add static to the CONFIG:
59 The same as above applies, you will just have to add static to the CONFIG:
60 qmake CONFIG+=static
60 qmake CONFIG+=static
61
61
62 Documentation
62 Documentation
63 =============
63 =============
64
64
65 The documentation can be generated with:
65 The documentation can be generated with:
66 make docs
66 make docs
67
67
68 The documentation is generated into the doc folder under the build folder.
68 The documentation is generated into the doc folder under the build folder.
69 Both Qt Assistant (qtcharts.qch) and in HTML format (qtcharts subfolder)
69 Both Qt Assistant (qtcharts.qch) and in HTML format (qtcharts subfolder)
70 documentation is generated.
70 documentation is generated.
71
71
72 Please refer to the generated documentation for more information:
72 Please refer to the generated documentation for more information:
73 doc/qtcharts/index.html
73 doc/qtcharts/index.html
74
74
75 Known issues
75 Known issues
76 ============
76 ============
77
77
78 - Zooming too far or too close may eventually freeze the zooming and scrolling.
78 - Zooming too far or too close may eventually freeze the zooming and scrolling.
Show file before | Show file after | Hide comments
@@ -1,72 +1,72
1 include($QT_INSTALL_DOCS/global/macros.qdocconf)
1 include($QT_INSTALL_DOCS/global/macros.qdocconf)
2 include($QT_INSTALL_DOCS/global/qt-cpp-defines.qdocconf)
2 include($QT_INSTALL_DOCS/global/qt-cpp-defines.qdocconf)
3 include($QT_INSTALL_DOCS/global/compat.qdocconf)
3 include($QT_INSTALL_DOCS/global/compat.qdocconf)
4 include($QT_INSTALL_DOCS/global/fileextensions.qdocconf)
4 include($QT_INSTALL_DOCS/global/fileextensions.qdocconf)
5 include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf)
5 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.0.1
9 version = 2.1.0
10
10
11 sourcedirs += .. \
11 sourcedirs += .. \
12 ../../chartsqml2
12 ../../chartsqml2
13 headerdirs += .. \
13 headerdirs += .. \
14 ../../chartsqml2
14 ../../chartsqml2
15 exampledirs += ../../../examples/charts \
15 exampledirs += ../../../examples/charts \
16 snippets
16 snippets
17 imagedirs += images
17 imagedirs += images
18 examplesinstallpath = charts
18 examplesinstallpath = charts
19
19
20 sources.fileextensions = "*.cpp *.qdoc"
20 sources.fileextensions = "*.cpp *.qdoc"
21
21
22 indexes += $QT_INSTALL_DOCS/qtcore/qtcore.index \
22 indexes += $QT_INSTALL_DOCS/qtcore/qtcore.index \
23 $QT_INSTALL_DOCS/qtgui/qtgui.index \
23 $QT_INSTALL_DOCS/qtgui/qtgui.index \
24 $QT_INSTALL_DOCS/qtqml/qtqml.index \
24 $QT_INSTALL_DOCS/qtqml/qtqml.index \
25 $QT_INSTALL_DOCS/qtquick/qtquick.index \
25 $QT_INSTALL_DOCS/qtquick/qtquick.index \
26 $QT_INSTALL_DOCS/qtmultimedia/qtmultimedia.index
26 $QT_INSTALL_DOCS/qtmultimedia/qtmultimedia.index
27
27
28 Cpp.ignoretokens = Q_INVOKABLE \
28 Cpp.ignoretokens = Q_INVOKABLE \
29 QT_CHARTS_EXPORT \
29 QT_CHARTS_EXPORT \
30 QT_CHARTS_END_NAMESPACE \
30 QT_CHARTS_END_NAMESPACE \
31 QT_CHARTS_BEGIN_NAMESPACE
31 QT_CHARTS_BEGIN_NAMESPACE
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.201
35 qhp.QtCharts.namespace = com.digia.qtcharts.210
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.0.1 qtrefdoc
40 qhp.QtCharts.filterAttributes = qtcharts 2.1.0 qtrefdoc
41 qhp.QtCharts.customFilters.Qt.name = QtCharts 2.0.1
41 qhp.QtCharts.customFilters.Qt.name = QtCharts 2.1.0
42 qhp.QtCharts.customFilters.Qt.filterAttributes = qtcharts 2.0.1
42 qhp.QtCharts.customFilters.Qt.filterAttributes = qtcharts 2.1.0
43
43
44 qhp.QtCharts.subprojects = gettingstarted classes types examples
44 qhp.QtCharts.subprojects = gettingstarted classes types examples
45
45
46 qhp.QtCharts.subprojects.gettingstarted.title = Getting Started
46 qhp.QtCharts.subprojects.gettingstarted.title = Getting Started
47 qhp.QtCharts.subprojects.gettingstarted.indexTitle = Qt Charts Getting Started
47 qhp.QtCharts.subprojects.gettingstarted.indexTitle = Qt Charts Getting Started
48 qhp.QtCharts.subprojects.gettingstarted.selectors = fake:page
48 qhp.QtCharts.subprojects.gettingstarted.selectors = fake:page
49 qhp.QtCharts.subprojects.gettingstarted.sortPages = true
49 qhp.QtCharts.subprojects.gettingstarted.sortPages = true
50
50
51 qhp.QtCharts.subprojects.classes.title = C++ Classes
51 qhp.QtCharts.subprojects.classes.title = C++ Classes
52 qhp.QtCharts.subprojects.classes.indexTitle = Qt Charts C++ Classes
52 qhp.QtCharts.subprojects.classes.indexTitle = Qt Charts C++ Classes
53 qhp.QtCharts.subprojects.classes.selectors = class
53 qhp.QtCharts.subprojects.classes.selectors = class
54 qhp.QtCharts.subprojects.classes.sortPages = true
54 qhp.QtCharts.subprojects.classes.sortPages = true
55
55
56 qhp.QtCharts.subprojects.types.title = QML Types
56 qhp.QtCharts.subprojects.types.title = QML Types
57 qhp.QtCharts.subprojects.types.indexTitle = Qt Charts QML Types
57 qhp.QtCharts.subprojects.types.indexTitle = Qt Charts QML Types
58 qhp.QtCharts.subprojects.types.selectors = qmlclass
58 qhp.QtCharts.subprojects.types.selectors = qmlclass
59 qhp.QtCharts.subprojects.types.sortPages = true
59 qhp.QtCharts.subprojects.types.sortPages = true
60
60
61 qhp.QtCharts.subprojects.examples.title = Examples
61 qhp.QtCharts.subprojects.examples.title = Examples
62 qhp.QtCharts.subprojects.examples.indexTitle = Qt Charts Examples
62 qhp.QtCharts.subprojects.examples.indexTitle = Qt Charts Examples
63 qhp.QtCharts.subprojects.examples.selectors = fake:example
63 qhp.QtCharts.subprojects.examples.selectors = fake:example
64 qhp.QtCharts.subprojects.examples.sortPages = true
64 qhp.QtCharts.subprojects.examples.sortPages = true
65
65
66 navigation.landingpage = Qt Charts
66 navigation.landingpage = Qt Charts
67 navigation.cppclassespage = Qt Charts C++ Classes
67 navigation.cppclassespage = Qt Charts C++ Classes
68 navigation.qmltypespage = Qt Charts QML Types
68 navigation.qmltypespage = Qt Charts QML Types
69
69
70 depends = qtwidgets
70 depends = qtwidgets
71
71
72 buildversion = Qt Charts $QT_VERSION Reference Documentation
72 buildversion = Qt Charts $QT_VERSION Reference Documentation
Show file before | Show file after | Hide comments
@@ -1,76 +1,76
1 /****************************************************************************
1 /****************************************************************************
2 **
2 **
3 ** Copyright (C) 2015 The Qt Company Ltd
3 ** Copyright (C) 2015 The Qt Company Ltd
4 ** All rights reserved.
4 ** All rights reserved.
5 ** For any questions to The Qt Company, please use contact form at http://qt.io
5 ** For any questions to The Qt Company, please use contact form at http://qt.io
6 **
6 **
7 ** This file is part of the Qt Charts module.
7 ** This file is part of the Qt Charts module.
8 **
8 **
9 ** Licensees holding valid commercial license for Qt may use this file in
9 ** Licensees holding valid commercial license for Qt may use this file in
10 ** accordance with the Qt License Agreement provided with the Software
10 ** accordance with the Qt License Agreement provided with the Software
11 ** or, alternatively, in accordance with the terms contained in a written
11 ** or, alternatively, in accordance with the terms contained in a written
12 ** agreement between you and The Qt Company.
12 ** agreement between you and The Qt Company.
13 **
13 **
14 ** If you have questions regarding the use of this file, please use
14 ** If you have questions regarding the use of this file, please use
15 ** contact form at http://qt.io
15 ** contact form at http://qt.io
16 **
16 **
17 ****************************************************************************/
17 ****************************************************************************/
18
18
19 #ifndef QCHARTGLOBAL_H
19 #ifndef QCHARTGLOBAL_H
20 #define QCHARTGLOBAL_H
20 #define QCHARTGLOBAL_H
21
21
22 #include <QtCore/QtGlobal>
22 #include <QtCore/QtGlobal>
23
23
24 #define QT_CHARTS_VERSION_STR "2.0.1"
24 #define QT_CHARTS_VERSION_STR "2.1.0"
25 /*
25 /*
26 QT_CHARTS_VERSION is (major << 16) + (minor << 8) + patch.
26 QT_CHARTS_VERSION is (major << 16) + (minor << 8) + patch.
27 */
27 */
28 #define QT_CHARTS_VERSION 0x020001
28 #define QT_CHARTS_VERSION 0x020100
29 /*
29 /*
30 can be used like #if (QT_CHARTS_VERSION >= QT_CHARTS_VERSION_CHECK(1, 1, 0))
30 can be used like #if (QT_CHARTS_VERSION >= QT_CHARTS_VERSION_CHECK(1, 1, 0))
31 */
31 */
32 #define QT_CHARTS_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
32 #define QT_CHARTS_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
33
33
34 #if defined(QT_CHARTS_LIBRARY)
34 #if defined(QT_CHARTS_LIBRARY)
35 # define QT_CHARTS_EXPORT Q_DECL_EXPORT
35 # define QT_CHARTS_EXPORT Q_DECL_EXPORT
36 #else
36 #else
37 # define QT_CHARTS_EXPORT Q_DECL_IMPORT
37 # define QT_CHARTS_EXPORT Q_DECL_IMPORT
38 #endif
38 #endif
39
39
40 #if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QT_CHARTS_LIBRARY)
40 #if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QT_CHARTS_LIBRARY)
41 # define QT_CHARTS_AUTOTEST_EXPORT Q_DECL_EXPORT
41 # define QT_CHARTS_AUTOTEST_EXPORT Q_DECL_EXPORT
42 #elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QT_CHARTS_LIBRARY)
42 #elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QT_CHARTS_LIBRARY)
43 # define QT_CHARTS_AUTOTEST_EXPORT Q_DECL_IMPORT
43 # define QT_CHARTS_AUTOTEST_EXPORT Q_DECL_IMPORT
44 #else
44 #else
45 # define QT_CHARTS_AUTOTEST_EXPORT
45 # define QT_CHARTS_AUTOTEST_EXPORT
46 #endif
46 #endif
47
47
48 #ifdef QT_CHARTS_STATICLIB
48 #ifdef QT_CHARTS_STATICLIB
49 # undef QT_CHARTS_EXPORT
49 # undef QT_CHARTS_EXPORT
50 # undef QT_CHARTS_AUTOTEST_EXPORT
50 # undef QT_CHARTS_AUTOTEST_EXPORT
51 # define QT_CHARTS_EXPORT
51 # define QT_CHARTS_EXPORT
52 # define QT_CHARTS_AUTOTEST_EXPORT
52 # define QT_CHARTS_AUTOTEST_EXPORT
53 #endif
53 #endif
54
54
55 #define QT_CHARTS_NAMESPACE QtCharts
55 #define QT_CHARTS_NAMESPACE QtCharts
56
56
57 #ifdef QT_CHARTS_NAMESPACE
57 #ifdef QT_CHARTS_NAMESPACE
58 # define QT_CHARTS_BEGIN_NAMESPACE namespace QT_CHARTS_NAMESPACE {
58 # define QT_CHARTS_BEGIN_NAMESPACE namespace QT_CHARTS_NAMESPACE {
59 # define QT_CHARTS_END_NAMESPACE }
59 # define QT_CHARTS_END_NAMESPACE }
60 # define QT_CHARTS_USE_NAMESPACE using namespace QT_CHARTS_NAMESPACE;
60 # define QT_CHARTS_USE_NAMESPACE using namespace QT_CHARTS_NAMESPACE;
61 #else
61 #else
62 # define QT_CHARTS_BEGIN_NAMESPACE
62 # define QT_CHARTS_BEGIN_NAMESPACE
63 # define QT_CHARTS_END_NAMESPACE
63 # define QT_CHARTS_END_NAMESPACE
64 # define QT_CHARTS_USE_NAMESPACE
64 # define QT_CHARTS_USE_NAMESPACE
65 #endif
65 #endif
66
66
67 /*
67 /*
68 On Windows min and max conflict with standard macros
68 On Windows min and max conflict with standard macros
69 */
69 */
70 #ifdef Q_OS_WIN
70 #ifdef Q_OS_WIN
71 #ifndef NOMINMAX
71 #ifndef NOMINMAX
72 #define NOMINMAX
72 #define NOMINMAX
73 #endif
73 #endif
74 #endif
74 #endif
75
75
76 #endif // QCHARTGLOBAL_H
76 #endif // QCHARTGLOBAL_H
General Comments 0
You need to be logged in to leave comments. Login now