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

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

Add possibility to build Charts without demos and examples...
Titta Heikkala -
r2606:fb7e40c1cc01
parent child
Show More
Side by Side Unified
Context file:
r2606:fb7e40c1cc01 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,109 +1,113
1 ----------------------
1 ----------------------
2 Qt Charts Add-on 1.3.0
2 Qt Charts Add-on 1.3.0
3 ----------------------
3 ----------------------
4
4
5 What's in Qt Charts
5 What's in Qt Charts
6 ===================
6 ===================
7
7
8 Directory structure:
8 Directory structure:
9
9
10 src/
10 src/
11 Source code of the Qt Charts
11 Source code of the Qt Charts
12 plugins/
12 plugins/
13 QML bindings plugins and QtCreator plugin
13 QML bindings plugins and QtCreator plugin
14 examples/
14 examples/
15 Some examples of using Qt Charts
15 Some examples of using Qt Charts
16 demos/
16 demos/
17 More versatile example applications showing how to customize charts,
17 More versatile example applications showing how to customize charts,
18 combine several chart types and implement interaction in charts
18 combine several chart types and implement interaction in charts
19 doc/
19 doc/
20 Documentation
20 Documentation
21 licenses/
21 licenses/
22 Licensing information
22 Licensing information
23
23
24 Building
24 Building
25 ========
25 ========
26 Please note that if you have already installed a previous version of
26 Please note that if you have already installed a previous version of
27 Qt Charts, you should first uninstall it with
27 Qt Charts, you should first uninstall it with
28 make uninstall
28 make uninstall
29
29
30 Configure project with qmake and build project with make:
30 Configure project with qmake and build project with make:
31 (Linux) make
31 (Linux) make
32 (Windows with MinGw) mingw32-make
32 (Windows with MinGw) mingw32-make
33 (Visual Studio) nmake
33 (Visual Studio) nmake
34 (OSX) make
34 (OSX) make
35
35
36 For debug builds:
36 For debug builds:
37 qmake CONFIG+=debug; make
37 qmake CONFIG+=debug; make
38 or
38 or
39 qmake CONFIG+=debug_and_release; make debug
39 qmake CONFIG+=debug_and_release; make debug
40
40
41 For release builds:
41 For release builds:
42 qmake CONFIG+=release ; make
42 qmake CONFIG+=release ; make
43 or
43 or
44 qmake CONFIG+=debug_and_release; make release
44 qmake CONFIG+=debug_and_release; make release
45
45
46 For both builds
46 For both builds
47 qmake CONFIG+="debug_and_release build_all"; make
47 qmake CONFIG+="debug_and_release build_all"; make
48
48
49 If you want to leave out demos and examples from the build you can use
50 the following config with qmake:
51 CONFIG+=nomake_demos_examples
52
49 If you want to install the libraries to your Qt library directory use:
53 If you want to install the libraries to your Qt library directory use:
50 make install
54 make install
51
55
52 If you want to uninstall the libraries
56 If you want to uninstall the libraries
53 make uninstall
57 make uninstall
54
58
55 Building as a statically linked library
59 Building as a statically linked library
56 =======================================
60 =======================================
57
61
58 The same as above applies you will just have to add staticlib to the CONFIG:
62 The same as above applies you will just have to add staticlib to the CONFIG:
59 qmake CONFIG+=staticlib
63 qmake CONFIG+=staticlib
60
64
61 Documentation
65 Documentation
62 =============
66 =============
63 Documentation can be found from doc/html and doc/qch directories. The documentation
67 Documentation can be found from doc/html and doc/qch directories. The documentation
64 can also be generated with:
68 can also be generated with:
65 make docs
69 make docs
66
70
67 Main Changes between 1.2.1 and 1.3.0
71 Main Changes between 1.2.1 and 1.3.0
68 ====================================
72 ====================================
69
73
70 - New chart type added: Polar chart
74 - New chart type added: Polar chart
71 - New series type added: Box and whiskers
75 - New series type added: Box and whiskers
72 - QtQuick 2 support added
76 - QtQuick 2 support added
73 - Note: Since Qt Charts still uses QGraphicsView framework under the hood
77 - Note: Since Qt Charts still uses QGraphicsView framework under the hood
74 even with QtQuick 2, its performance is actually better with QtQuick 1 than with QtQuick 2.
78 even with QtQuick 2, its performance is actually better with QtQuick 1 than with QtQuick 2.
75
79
76 Bug Fixes and minor new features
80 Bug Fixes and minor new features
77 ================================
81 ================================
78
82
79 - New: Added missing QML support for LogValueAxis
83 - New: Added missing QML support for LogValueAxis
80 - New: Implement index based removing/replacing points in a series
84 - New: Implement index based removing/replacing points in a series
81 - New: Added API to specify plot area background for the chart
85 - New: Added API to specify plot area background for the chart
82 - New: Added HTML support for various text items such as axis labels or titles
86 - New: Added HTML support for various text items such as axis labels or titles
83 - HTML tags (e.g. <br/>) and character codes (e.g. &deg;) are now supported
87 - HTML tags (e.g. <br/>) and character codes (e.g. &deg;) are now supported
84 - Setting pen for text items is deprecated and does nothing
88 - Setting pen for text items is deprecated and does nothing
85 - When setting brush for text items, only the color of the brush is relevant.
89 - When setting brush for text items, only the color of the brush is relevant.
86 It specifies the default text color for the item.
90 It specifies the default text color for the item.
87 - Logic for identifying axis label format specifiers was improved, so adding
91 - Logic for identifying axis label format specifiers was improved, so adding
88 additional information to labels via label format string is now more viable.
92 additional information to labels via label format string is now more viable.
89 - New: Added QChart::zoomReset() and QChart::isZoomed()
93 - New: Added QChart::zoomReset() and QChart::isZoomed()
90 - New: Added API for setting roundness of the corners for the background of the chart
94 - New: Added API for setting roundness of the corners for the background of the chart
91 - Fixed: If vertical QLogValueAxis base is selected so that it has only single visible tick,
95 - Fixed: If vertical QLogValueAxis base is selected so that it has only single visible tick,
92 its label always displays as "..."
96 its label always displays as "..."
93 - Fixed: Crash when removing pie series from chart
97 - Fixed: Crash when removing pie series from chart
94 - Fixed: Most themes disable axis shades
98 - Fixed: Most themes disable axis shades
95 - Fixed: Lingering shades from high contrast theme
99 - Fixed: Lingering shades from high contrast theme
96 - Fixed: Crash when adding/removing points during animation
100 - Fixed: Crash when adding/removing points during animation
97 - Fixed: Wrong expand direction with rotated chart view
101 - Fixed: Wrong expand direction with rotated chart view
98 - Fixed: Android build errors
102 - Fixed: Android build errors
99 - Fixed: Explicitly set default pen/brush/font got overridden by theme
103 - Fixed: Explicitly set default pen/brush/font got overridden by theme
100 - Default pens, brushes, and fonts were changed to ones that won't clash with commonly
104 - Default pens, brushes, and fonts were changed to ones that won't clash with commonly
101 used types of the same. Most notably black pen is no longer default and won't anymore
105 used types of the same. Most notably black pen is no longer default and won't anymore
102 get overridden by theme if used.
106 get overridden by theme if used.
103 - Fixed: Multi-line axis titles and labels now position correctly
107 - Fixed: Multi-line axis titles and labels now position correctly
104 - Note that '\n' no longer causes new line in text items, use HTML tag <br/> instead
108 - Note that '\n' no longer causes new line in text items, use HTML tag <br/> instead
105 - Fixed: Legend markers text truncation with small font sizes
109 - Fixed: Legend markers text truncation with small font sizes
106 - Fixed: QChartView right click zoom out when zooming only along one axis
110 - Fixed: QChartView right click zoom out when zooming only along one axis
107 - Fixed: Crash or memory leak when resetting animation options mid-animation
111 - Fixed: Crash or memory leak when resetting animation options mid-animation
108 - Fixed: QBarCategoryAxis doesn't notify domain on category remove
112 - Fixed: QBarCategoryAxis doesn't notify domain on category remove
109 - Fixed: axisXTop QML property now actually puts axis on top
113 - Fixed: axisXTop QML property now actually puts axis on top
Show file before | Show file after | Hide comments
@@ -1,82 +1,84
1 !include(config.pri) {
1 !include(config.pri) {
2 error('Missing config.pri')
2 error('Missing config.pri')
3 }
3 }
4
4
5 TEMPLATE = subdirs
5 TEMPLATE = subdirs
6 SUBDIRS = src plugins demos examples tests
6 SUBDIRS = src plugins
7 !nomake_demos_examples: SUBDIRS += demos examples
8 SUBDIRS += tests
7
9
8 development_build: message('Development build')
10 development_build: message('Development build')
9
11
10 CONFIG += ordered
12 CONFIG += ordered
11 QMAKE_CXXFLAGS += -g -Wall
13 QMAKE_CXXFLAGS += -g -Wall
12 unix:QMAKE_DISTCLEAN += -r build bin include lib doc/html
14 unix:QMAKE_DISTCLEAN += -r build bin include lib doc/html
13 win32:QMAKE_DISTCLEAN += /Q /s build bin include lib doc\\html
15 win32:QMAKE_DISTCLEAN += /Q /s build bin include lib doc\\html
14
16
15 # install feature file
17 # install feature file
16 feature.path = $$[QT_INSTALL_DATA]/mkspecs/features
18 feature.path = $$[QT_INSTALL_DATA]/mkspecs/features
17 feature.files = $$PWD/features/qtcommercialchart.prf
19 feature.files = $$PWD/features/qtcommercialchart.prf
18 INSTALLS += feature
20 INSTALLS += feature
19
21
20 # docs
22 # docs
21 CHARTS_VERSION = 1.3.0
23 CHARTS_VERSION = 1.3.0
22 CHARTS_VERSION_TAG = 130
24 CHARTS_VERSION_TAG = 130
23
25
24 contains(QMAKE_HOST.os, Windows) {
26 contains(QMAKE_HOST.os, Windows) {
25 QDOC_CONF = $$CHART_BUILD_DOC_DIR\\qcharts.qdocconf
27 QDOC_CONF = $$CHART_BUILD_DOC_DIR\\qcharts.qdocconf
26 win32-g++|qnx {
28 win32-g++|qnx {
27 VERSION_SETTINGS = \
29 VERSION_SETTINGS = \
28 set QT_CHARTS_VERSION=$$CHARTS_VERSION&& set QT_CHARTS_VERSION_TAG=$$CHARTS_VERSION_TAG&&
30 set QT_CHARTS_VERSION=$$CHARTS_VERSION&& set QT_CHARTS_VERSION_TAG=$$CHARTS_VERSION_TAG&&
29 } else {
31 } else {
30 VERSION_SETTINGS = \
32 VERSION_SETTINGS = \
31 set QT_CHARTS_VERSION=$$CHARTS_VERSION $$escape_expand(\\n\\t) \
33 set QT_CHARTS_VERSION=$$CHARTS_VERSION $$escape_expand(\\n\\t) \
32 set QT_CHARTS_VERSION_TAG=$$CHARTS_VERSION_TAG $$escape_expand(\\n\\t)
34 set QT_CHARTS_VERSION_TAG=$$CHARTS_VERSION_TAG $$escape_expand(\\n\\t)
33 }
35 }
34 } else {
36 } else {
35 QDOC_CONF = $$CHART_BUILD_DOC_DIR/qcharts.qdocconf
37 QDOC_CONF = $$CHART_BUILD_DOC_DIR/qcharts.qdocconf
36 VERSION_SETTINGS = \
38 VERSION_SETTINGS = \
37 QT_CHARTS_VERSION=$$CHARTS_VERSION QT_CHARTS_VERSION_TAG=$$CHARTS_VERSION_TAG
39 QT_CHARTS_VERSION=$$CHARTS_VERSION QT_CHARTS_VERSION_TAG=$$CHARTS_VERSION_TAG
38 }
40 }
39
41
40 contains(QT_MAJOR_VERSION, 5) {
42 contains(QT_MAJOR_VERSION, 5) {
41 QDOC_CMD = qdoc
43 QDOC_CMD = qdoc
42 HELPGENERATOR_CMD = qhelpgenerator -platform minimal
44 HELPGENERATOR_CMD = qhelpgenerator -platform minimal
43 } else {
45 } else {
44 QDOC_CMD = qdoc3
46 QDOC_CMD = qdoc3
45 HELPGENERATOR_CMD = qhelpgenerator
47 HELPGENERATOR_CMD = qhelpgenerator
46 }
48 }
47
49
48 QHP_FILE = doc/html/qtcharts.qhp
50 QHP_FILE = doc/html/qtcharts.qhp
49 QCH_FILE = doc/qch/qtcharts.qch
51 QCH_FILE = doc/qch/qtcharts.qch
50
52
51 docs.target = docs
53 docs.target = docs
52 docs.depends = qch_docs FORCE
54 docs.depends = qch_docs FORCE
53 qch_docs.target = qch_docs
55 qch_docs.target = qch_docs
54 qch_docs.commands = $$HELPGENERATOR_CMD $$QHP_FILE -o $$QCH_FILE
56 qch_docs.commands = $$HELPGENERATOR_CMD $$QHP_FILE -o $$QCH_FILE
55 qch_docs.depends = html_docs FORCE
57 qch_docs.depends = html_docs FORCE
56 html_docs.target = html_docs
58 html_docs.target = html_docs
57 html_docs.commands = $$VERSION_SETTINGS $$QDOC_CMD $$QDOC_CONF
59 html_docs.commands = $$VERSION_SETTINGS $$QDOC_CMD $$QDOC_CONF
58 html_docs.depends = FORCE
60 html_docs.depends = FORCE
59
61
60 QMAKE_EXTRA_TARGETS += docs qch_docs html_docs
62 QMAKE_EXTRA_TARGETS += docs qch_docs html_docs
61
63
62 # coverage
64 # coverage
63 unix:coverage:{
65 unix:coverage:{
64 QMAKE_DISTCLEAN += -r ./coverage
66 QMAKE_DISTCLEAN += -r ./coverage
65 QMAKE_CLEAN += build/*.gcda build/*.gcno
67 QMAKE_CLEAN += build/*.gcda build/*.gcno
66 QMAKE_EXTRA_TARGETS += buildcoverage runcoverage gencoverage
68 QMAKE_EXTRA_TARGETS += buildcoverage runcoverage gencoverage
67
69
68 buildcoverage.target = build_coverage
70 buildcoverage.target = build_coverage
69 buildcoverage.depends = all
71 buildcoverage.depends = all
70 buildcoverage.commands = mkdir -p ./coverage; \
72 buildcoverage.commands = mkdir -p ./coverage; \
71 make -C src prepare_coverage;
73 make -C src prepare_coverage;
72
74
73 runcoverage.target = run_coverage
75 runcoverage.target = run_coverage
74 runcoverage.depends = buildcoverage
76 runcoverage.depends = buildcoverage
75 runcoverage.commands = for f in `ls ./bin/tst_*` ; do echo "processing \$\$f test..."; \$\$f >> unit.log; done ; exit 0;
77 runcoverage.commands = for f in `ls ./bin/tst_*` ; do echo "processing \$\$f test..."; \$\$f >> unit.log; done ; exit 0;
76
78
77 gencoverage.target = gen_coverage
79 gencoverage.target = gen_coverage
78 gencoverage.depends = runcoverage
80 gencoverage.depends = runcoverage
79 gencoverage.commands = make -C src gen_coverage; \
81 gencoverage.commands = make -C src gen_coverage; \
80 genhtml -o ./coverage ./coverage/coverage.info --prefix $$PWD
82 genhtml -o ./coverage ./coverage/coverage.info --prefix $$PWD
81 }
83 }
82
84
Show file before | Show file after | Hide comments
@@ -1,66 +1,73
1 /*!
1 /*!
2 \page gettingstarted.html
2 \page gettingstarted.html
3 \title Qt Charts getting started
3 \title Qt Charts getting started
4 \keyword Introduction
4 \keyword Introduction
5
5
6 Compiling:
6 Compiling:
7 \code
7 \code
8 qmake CONFIG+=release
8 qmake CONFIG+=release
9 make
9 make
10 make install
10 make install
11 \endcode
11 \endcode
12
12
13 Depending on the OS and the compiler you are using "make" might need to be replaced with another command like: nmake, mingw32-make, etc.
13 Depending on the OS and the compiler you are using "make" might need to be replaced with another command like: nmake, mingw32-make, etc.
14
14
15 To uninstall the Qt Charts run:
15 To uninstall the Qt Charts run:
16 \code
16 \code
17 make uninstall
17 make uninstall
18 \endcode
18 \endcode
19
19
20 Compiling as a static library (lib only):
20 Compiling as a static library (lib only):
21 \code
21 \code
22 qmake CONFIG+=staticlib
22 qmake CONFIG+=staticlib
23 make
23 make
24 make install
24 make install
25 \endcode
25 \endcode
26
26
27 Building both debug and release at the same time:
27 Building both debug and release at the same time:
28 \code
28 \code
29 qmake CONFIG+="debug_and_release build_all"
29 qmake CONFIG+="debug_and_release build_all"
30 make
30 make
31 make install
31 make install
32 \endcode
32 \endcode
33
33
34 Please take a note that the \i build_all option is necessary for the install to work correctly. Otherwise it will not install both versions.
34 Please take a note that the \i build_all option is necessary for the install to work correctly. Otherwise it will not install both versions.
35
35
36 Building without demos and examples:
37 \code
38 qmake CONFIG+=nomake_demos_examples
39 make
40 make install
41 \endcode
42
36 \bold {New project}
43 \bold {New project}
37
44
38 Create a new project in a usual way and then add to your project's *.pro file following line:
45 Create a new project in a usual way and then add to your project's *.pro file following line:
39
46
40 \code
47 \code
41 CONFIG += qtcommercialchart
48 CONFIG += qtcommercialchart
42 \endcode
49 \endcode
43
50
44 \bold {Widget project}
51 \bold {Widget project}
45
52
46 To use the Qt Charts classes add Qt Charts namespace macro in your header file.
53 To use the Qt Charts classes add Qt Charts namespace macro in your header file.
47 \code
54 \code
48 #include<QWidget>
55 #include<QWidget>
49 #include<QChartView>
56 #include<QChartView>
50
57
51 QTCOMMERCIALCHART_USE_NAMESPACE
58 QTCOMMERCIALCHART_USE_NAMESPACE
52
59
53 class ExampleWidget : public QWidget
60 class ExampleWidget : public QWidget
54 \endcode
61 \endcode
55
62
56 \bold {QML project}
63 \bold {QML project}
57
64
58 Add an import line to your *.qml file:
65 Add an import line to your *.qml file:
59 \code
66 \code
60 import QtCommercial.Chart 1.3
67 import QtCommercial.Chart 1.3
61 \endcode
68 \endcode
62
69
63 \raw HTML
70 \raw HTML
64 \endraw
71 \endraw
65
72
66 */
73 */
General Comments 0
You need to be logged in to leave comments. Login now