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

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

Updated Charts version and README file for release...
Titta Heikkala -
r2693:57eb7a330245
parent child
Show More
Side by Side Unified
Context file:
r2693:57eb7a330245 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,121 +1,116
1 ----------------------
1 ----------------------
2 Qt Charts Add-on 1.3.1
2 Qt Charts Add-on 1.4.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
26
27 Please note that if you have already installed a previous version of
27 Please note that if you have already installed a previous version of
28 Qt Charts, you should first uninstall it with
28 Qt Charts, you should first uninstall it with
29 make uninstall
29 make uninstall
30
30
31 Configure project with qmake and build project with make:
31 Configure project with qmake and build project with make:
32 (Linux) make
32 (Linux) make
33 (Windows with MinGw) mingw32-make
33 (Windows with MinGw) mingw32-make
34 (Visual Studio) nmake
34 (Visual Studio) nmake
35 (OSX) make
35 (OSX) make
36
36
37 For debug builds:
37 For debug builds:
38 qmake CONFIG+=debug; make
38 qmake CONFIG+=debug; make
39 or
39 or
40 qmake CONFIG+=debug_and_release; make debug
40 qmake CONFIG+=debug_and_release; make debug
41
41
42 For release builds:
42 For release builds:
43 qmake CONFIG+=release; make
43 qmake CONFIG+=release; make
44 or
44 or
45 qmake CONFIG+=debug_and_release; make release
45 qmake CONFIG+=debug_and_release; make release
46
46
47 For both builds:
47 For both builds:
48 qmake CONFIG+="debug_and_release build_all"; make
48 qmake CONFIG+="debug_and_release build_all"; make
49
49
50 If you want to leave out demos and examples from the build you can use
50 If you want to leave out demos and examples from the build you can use
51 the following config with qmake:
51 the following config with qmake:
52 CONFIG+=nomake_demos_examples
52 CONFIG+=nomake_demos_examples
53 For some embedded environments, such as VxWorks, all examples and demos
53 For some embedded environments, such as VxWorks, all examples and demos
54 may not be applicable. There it's recommended to use the above mentioned
54 may not be applicable. There it's recommended to use the above mentioned
55 config option.
55 config option.
56
56
57 If you want to install the libraries to your Qt library directory use:
57 If you want to install the libraries to your Qt library directory use:
58 make install
58 make install
59
59
60 If you want to uninstall the libraries:
60 If you want to uninstall the libraries:
61 make uninstall
61 make uninstall
62
62
63 Building as a statically linked library
63 Building as a statically linked library
64 =======================================
64 =======================================
65
65
66 The same as above applies, you will just have to add staticlib to the CONFIG:
66 The same as above applies, you will just have to add staticlib to the CONFIG:
67 qmake CONFIG+=staticlib
67 qmake CONFIG+=staticlib
68
68
69 Documentation
69 Documentation
70 =============
70 =============
71
71
72 Documentation can be found from doc/html and doc/qch directories. The documentation
72 Documentation can be found from doc/html and doc/qch directories. The documentation
73 can also be generated with:
73 can also be generated with:
74 make docs
74 make docs
75
75
76 The documentation provided with Charts is generated with qdoc and the creation of the
76 The documentation provided with Charts is generated with qdoc and the creation of the
77 documentation is prioritized for Qt5. We recommend building the documentation using Qt5,
77 documentation is prioritized for Qt5. We recommend building the documentation using Qt5,
78 if you want to do it yourself. Creating the documentation using Qt4 also works, but some
78 if you want to do it yourself. Creating the documentation using Qt4 also works, but some
79 pages are not generated correctly, such as the 'List of All Members' page for all C++ and
79 pages are not generated correctly, such as the 'List of All Members' page for all C++ and
80 QML APIs in .qch documentation.
80 QML APIs in .qch documentation.
81
81
82 Main Changes between 1.3.0 and 1.3.1
82 Main Changes between 1.3.1 and 1.4.0
83 ====================================
83 ====================================
84
84
85 - New Qt theme template added
85 - New: Added possibility to set brush image for AreaSeries, BarSet, BoxPlotSeries,
86 BoxSet, PieSlice and ScatterSeries by specifying 'brushFilename'
87 - New: Added possibility to show series point values for line, spline and scatter series
88 - New: Added possibility to position the bar value labels
86
89
87 Bug Fixes and minor new features
90 Bug Fixes and minor new features
88 ================================
91 ================================
89
92
90 - New: Added new hovered signal for bar charts with index information
93 - New: Added count property for QBoxPlotSeries
91 - New: Added example of using dynamically generated image as a brush for scatter series
94 - New: Added option to set markers in legend in reverse order
92 - New: Added HTML support for pie slice labels
95 - New: Install the plugins.qmltypes file for Qt Quick 2 requested by Qt Creator
93 - New: Added possibility to build Charts without demos and examples
96 - New: Added clear function for BarCategoryAxis
94 - Fixed: Theme initialization performance for bar series is improved
97 - Fixed: Assert failure with percent bar series zero values
95 - Fixed: Documentation generated against Qt5
98 - Fixed: Updated files generated with Qt Creator for demos
96 - Fixed: Pie chart label is truncated if there's not enough space for the label
99 - Fixed: DeclarativeChart::legend property marked as constant
97 - Fixed: Legend item truncation to start with the longest item
100 - Fixed: Crash with ScatterChartItem mouse events
98 - Fixed: Vertical and horizontal truncation of labels in bar chart
101 - Fixed: Build for iOS and for building the QtQuick2 plugin statically
99 - Fixed: Dynamic qml axis switch
102 - Fixed: Setting values for BarSet using Qt.point
100 - Fixed: Crash with empty QAreaSeries
103 - Fixed: Bar category rendering for empty category
101 - Fixed: Missing legend when printing a chart that is not shown
104 - Fixed: QBoxSet color setting
102 - Fixed: Crash when zooming
105 - Fixed: Mouse event handling for pie
103 - Fixed: Chart geometry calculated only for visible items
106 - Fixed: Legend truncation
104 - Fixed: Alignment for multiline items
107 - Fixed: Scatter series color
105 - Alignment can be set for multiline items using format:
108 - Fixed: Crash in ChartDataSet::attachAxis()
106 "<p align=\"center\">multiline<br\>item</p>"
109 - Fixed: Added missing library directory
107 - Fixed: Removed redundancy when setting the axis title
110 - Fixed: Added Charts directory to include path
108 - Fixed: Mouse event handling with rubber band
111 - Fixed: NOMINMAX definition
109 - Fixed: logarithmic axis point calculation for zero and negative values
110 - Fixed: Chart build on Solaris
111 - Fixed: Axis creation with createDefaultAxes() when series of different types are present
112 - Fixed: Debug information text color changed to gray to make it visible with all themes
113 - Fixed: Min and max conflict with standard macros on Windows
114 - Fixed: Chart build with QT_NO_TEXTSTREAM definition
115 - Fixed: Chart build with QT_NO_RUBBERBAND definition
116 - Fixed: Chart build with QT_NO_GRAPHICSEFFECT definition
117
112
118 Known issues
113 Known issues
119 ============
114 ============
120
115
121 - Zooming too far or too close may eventually freeze the zooming and scrolling.
116 - Zooming too far or too close may eventually freeze the zooming and scrolling.
Show file before | Show file after | Hide comments
@@ -1,91 +1,91
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
6 SUBDIRS = src plugins
7 !nomake_demos_examples: SUBDIRS += demos examples
7 !nomake_demos_examples: SUBDIRS += demos examples
8 exists(tests): SUBDIRS += tests
8 exists(tests): SUBDIRS += tests
9
9
10 development_build: message('Development build')
10 development_build: message('Development build')
11
11
12 CONFIG += ordered
12 CONFIG += ordered
13 QMAKE_CXXFLAGS += -g -Wall
13 QMAKE_CXXFLAGS += -g -Wall
14 unix:QMAKE_DISTCLEAN += -r build bin include lib doc/html
14 unix:QMAKE_DISTCLEAN += -r build bin include lib doc/html
15 win32:QMAKE_DISTCLEAN += /Q /s build bin include lib doc\\html
15 win32:QMAKE_DISTCLEAN += /Q /s build bin include lib doc\\html
16
16
17 # install feature file
17 # install feature file
18 feature.path = $$[QT_INSTALL_DATA]/mkspecs/features
18 feature.path = $$[QT_INSTALL_DATA]/mkspecs/features
19 feature.files = $$PWD/features/qtcommercialchart.prf
19 feature.files = $$PWD/features/qtcommercialchart.prf
20 INSTALLS += feature
20 INSTALLS += feature
21
21
22 # docs
22 # docs
23 CHARTS_VERSION = 1.3.1
23 CHARTS_VERSION = 1.4.0
24 CHARTS_VERSION_TAG = 131
24 CHARTS_VERSION_TAG = 140
25
25
26 contains(QT_MAJOR_VERSION, 5) {
26 contains(QT_MAJOR_VERSION, 5) {
27 QDOC_CONFFILE = qcharts-qt5.qdocconf
27 QDOC_CONFFILE = qcharts-qt5.qdocconf
28 DEFINES += QDOC_QT5
28 DEFINES += QDOC_QT5
29 } else {
29 } else {
30 QDOC_CONFFILE = qcharts-qt4.qdocconf
30 QDOC_CONFFILE = qcharts-qt4.qdocconf
31 }
31 }
32
32
33 contains(QMAKE_HOST.os, Windows) {
33 contains(QMAKE_HOST.os, Windows) {
34 QDOC_CONF = $$CHART_BUILD_DOC_DIR\\docconf\\$$QDOC_CONFFILE
34 QDOC_CONF = $$CHART_BUILD_DOC_DIR\\docconf\\$$QDOC_CONFFILE
35 win32-g++|qnx {
35 win32-g++|qnx {
36 VERSION_SETTINGS = \
36 VERSION_SETTINGS = \
37 set QT_CHARTS_VERSION=$$CHARTS_VERSION&& set QT_CHARTS_VERSION_TAG=$$CHARTS_VERSION_TAG&&
37 set QT_CHARTS_VERSION=$$CHARTS_VERSION&& set QT_CHARTS_VERSION_TAG=$$CHARTS_VERSION_TAG&&
38 } else {
38 } else {
39 VERSION_SETTINGS = \
39 VERSION_SETTINGS = \
40 set QT_CHARTS_VERSION=$$CHARTS_VERSION $$escape_expand(\\n\\t) \
40 set QT_CHARTS_VERSION=$$CHARTS_VERSION $$escape_expand(\\n\\t) \
41 set QT_CHARTS_VERSION_TAG=$$CHARTS_VERSION_TAG $$escape_expand(\\n\\t)
41 set QT_CHARTS_VERSION_TAG=$$CHARTS_VERSION_TAG $$escape_expand(\\n\\t)
42 }
42 }
43 } else {
43 } else {
44 QDOC_CONF = $$CHART_BUILD_DOC_DIR/docconf/$$QDOC_CONFFILE
44 QDOC_CONF = $$CHART_BUILD_DOC_DIR/docconf/$$QDOC_CONFFILE
45 VERSION_SETTINGS = \
45 VERSION_SETTINGS = \
46 QT_CHARTS_VERSION=$$CHARTS_VERSION QT_CHARTS_VERSION_TAG=$$CHARTS_VERSION_TAG
46 QT_CHARTS_VERSION=$$CHARTS_VERSION QT_CHARTS_VERSION_TAG=$$CHARTS_VERSION_TAG
47 }
47 }
48
48
49 contains(QT_MAJOR_VERSION, 5) {
49 contains(QT_MAJOR_VERSION, 5) {
50 QDOC_CMD = qdoc
50 QDOC_CMD = qdoc
51 HELPGENERATOR_CMD = qhelpgenerator -platform minimal
51 HELPGENERATOR_CMD = qhelpgenerator -platform minimal
52 } else {
52 } else {
53 QDOC_CMD = qdoc3
53 QDOC_CMD = qdoc3
54 HELPGENERATOR_CMD = qhelpgenerator
54 HELPGENERATOR_CMD = qhelpgenerator
55 }
55 }
56
56
57 QHP_FILE = doc/html/qtcharts.qhp
57 QHP_FILE = doc/html/qtcharts.qhp
58 QCH_FILE = doc/qch/qtcharts.qch
58 QCH_FILE = doc/qch/qtcharts.qch
59
59
60 docs.target = docs
60 docs.target = docs
61 docs.depends = qch_docs FORCE
61 docs.depends = qch_docs FORCE
62 qch_docs.target = qch_docs
62 qch_docs.target = qch_docs
63 qch_docs.commands = $$HELPGENERATOR_CMD $$QHP_FILE -o $$QCH_FILE
63 qch_docs.commands = $$HELPGENERATOR_CMD $$QHP_FILE -o $$QCH_FILE
64 qch_docs.depends = html_docs FORCE
64 qch_docs.depends = html_docs FORCE
65 html_docs.target = html_docs
65 html_docs.target = html_docs
66 html_docs.commands = $$VERSION_SETTINGS $$QDOC_CMD $$QDOC_CONF
66 html_docs.commands = $$VERSION_SETTINGS $$QDOC_CMD $$QDOC_CONF
67 html_docs.depends = FORCE
67 html_docs.depends = FORCE
68
68
69 QMAKE_EXTRA_TARGETS += docs qch_docs html_docs
69 QMAKE_EXTRA_TARGETS += docs qch_docs html_docs
70
70
71 # coverage
71 # coverage
72 unix:coverage:{
72 unix:coverage:{
73 QMAKE_DISTCLEAN += -r ./coverage
73 QMAKE_DISTCLEAN += -r ./coverage
74 QMAKE_CLEAN += build/*.gcda build/*.gcno
74 QMAKE_CLEAN += build/*.gcda build/*.gcno
75 QMAKE_EXTRA_TARGETS += buildcoverage runcoverage gencoverage
75 QMAKE_EXTRA_TARGETS += buildcoverage runcoverage gencoverage
76
76
77 buildcoverage.target = build_coverage
77 buildcoverage.target = build_coverage
78 buildcoverage.depends = all
78 buildcoverage.depends = all
79 buildcoverage.commands = mkdir -p ./coverage; \
79 buildcoverage.commands = mkdir -p ./coverage; \
80 make -C src prepare_coverage;
80 make -C src prepare_coverage;
81
81
82 runcoverage.target = run_coverage
82 runcoverage.target = run_coverage
83 runcoverage.depends = buildcoverage
83 runcoverage.depends = buildcoverage
84 runcoverage.commands = for f in `ls ./bin/tst_*` ; do echo "processing \$\$f test..."; \$\$f >> unit.log; done ; exit 0;
84 runcoverage.commands = for f in `ls ./bin/tst_*` ; do echo "processing \$\$f test..."; \$\$f >> unit.log; done ; exit 0;
85
85
86 gencoverage.target = gen_coverage
86 gencoverage.target = gen_coverage
87 gencoverage.depends = runcoverage
87 gencoverage.depends = runcoverage
88 gencoverage.commands = make -C src gen_coverage; \
88 gencoverage.commands = make -C src gen_coverage; \
89 genhtml -o ./coverage ./coverage/coverage.info --prefix $$PWD
89 genhtml -o ./coverage ./coverage/coverage.info --prefix $$PWD
90 }
90 }
91
91
Show file before | Show file after | Hide comments
@@ -1,44 +1,44
1 project = Qt Charts
1 project = Qt Charts
2 description = Library for creating charts
2 description = Library for creating charts
3 version = 1.3.1
3 version = 1.4.0
4
4
5 sourcedirs = ../../src \
5 sourcedirs = ../../src \
6 ../../examples \
6 ../../examples \
7 ../src \
7 ../src \
8 ../qch \
8 ../qch \
9 ../../plugins/declarative
9 ../../plugins/declarative
10 headerdirs = ../../src \
10 headerdirs = ../../src \
11 ../../examples \
11 ../../examples \
12 ../../plugins/declarative
12 ../../plugins/declarative
13 exampledirs = ../../ \
13 exampledirs = ../../ \
14 ../../src \
14 ../../src \
15 ../../examples
15 ../../examples
16
16
17 outputdir = ../html
17 outputdir = ../html
18 imagedirs = ../images
18 imagedirs = ../images
19
19
20 sources.fileextensions = *.cpp *.qdoc *.mm *.qml *.qdocinc
20 sources.fileextensions = *.cpp *.qdoc *.mm *.qml *.qdocinc
21 headers.fileextensions = *.h *.ch *.h++ *.hh *.hpp *.hxx
21 headers.fileextensions = *.h *.ch *.h++ *.hh *.hpp *.hxx
22 examples.fileextensions = *.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml
22 examples.fileextensions = *.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml
23 examples.imageextensions = *.png *.jpeg *.jpg *.gif *.mng
23 examples.imageextensions = *.png *.jpeg *.jpg *.gif *.mng
24
24
25 Cpp.ignoretokens = Q_INVOKABLE \
25 Cpp.ignoretokens = Q_INVOKABLE \
26 QTCOMMERCIALCHART_EXPORT \
26 QTCOMMERCIALCHART_EXPORT \
27 QTCOMMERCIALCHART_END_NAMESPACE \
27 QTCOMMERCIALCHART_END_NAMESPACE \
28 QTCOMMERCIALCHART_BEGIN_NAMESPACE
28 QTCOMMERCIALCHART_BEGIN_NAMESPACE
29 Cpp.ignoredirectives = Q_DECLARE_HANDLE \
29 Cpp.ignoredirectives = Q_DECLARE_HANDLE \
30 Q_DECLARE_INTERFACE \
30 Q_DECLARE_INTERFACE \
31 Q_DECLARE_METATYPE \
31 Q_DECLARE_METATYPE \
32 Q_DECLARE_OPERATORS_FOR_FLAGS \
32 Q_DECLARE_OPERATORS_FOR_FLAGS \
33 Q_DECLARE_PRIVATE \
33 Q_DECLARE_PRIVATE \
34 Q_DECLARE_PUBLIC \
34 Q_DECLARE_PUBLIC \
35 Q_DECLARE_SHARED \
35 Q_DECLARE_SHARED \
36 Q_DECLARE_TR_FUNCTIONS \
36 Q_DECLARE_TR_FUNCTIONS \
37 Q_DECLARE_TYPEINFO \
37 Q_DECLARE_TYPEINFO \
38 Q_DISABLE_COPY \
38 Q_DISABLE_COPY \
39 QT_FORWARD_DECLARE_CLASS \
39 QT_FORWARD_DECLARE_CLASS \
40 Q_DUMMY_COMPARISON_OPERATOR \
40 Q_DUMMY_COMPARISON_OPERATOR \
41 Q_ENUMS \
41 Q_ENUMS \
42 Q_FLAGS \
42 Q_FLAGS \
43 Q_INTERFACES \
43 Q_INTERFACES \
44 __attribute__
44 __attribute__
Show file before | Show file after | Hide comments
@@ -1,73 +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 note that the \e build_all option is necessary for the install to work correctly. Otherwise it will not install both versions.
34 Please note that the \e 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:
36 Building without demos and examples:
37 \code
37 \code
38 qmake CONFIG+=nomake_demos_examples
38 qmake CONFIG+=nomake_demos_examples
39 make
39 make
40 make install
40 make install
41 \endcode
41 \endcode
42
42
43 \b {New project}
43 \b {New project}
44
44
45 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:
46
46
47 \code
47 \code
48 CONFIG += qtcommercialchart
48 CONFIG += qtcommercialchart
49 \endcode
49 \endcode
50
50
51 \b {Widget project}
51 \b {Widget project}
52
52
53 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.
54 \code
54 \code
55 #include<QWidget>
55 #include<QWidget>
56 #include<QChartView>
56 #include<QChartView>
57
57
58 QTCOMMERCIALCHART_USE_NAMESPACE
58 QTCOMMERCIALCHART_USE_NAMESPACE
59
59
60 class ExampleWidget : public QWidget
60 class ExampleWidget : public QWidget
61 \endcode
61 \endcode
62
62
63 \b {QML project}
63 \b {QML project}
64
64
65 Add an import line to your *.qml file:
65 Add an import line to your *.qml file:
66 \code
66 \code
67 import QtCommercial.Chart 1.3
67 import QtCommercial.Chart 1.4
68 \endcode
68 \endcode
69
69
70 \raw HTML
70 \raw HTML
71 \endraw
71 \endraw
72
72
73 */
73 */
Show file before | Show file after | Hide comments
@@ -1,3 +1,3
1 /*!
1 /*!
2 \qmlmodule QtCommercial.Chart 1.3
2 \qmlmodule QtCommercial.Chart 1.4
3 */
3 */
Show file before | Show file after | Hide comments
@@ -1,97 +1,97
1 /****************************************************************************
1 /****************************************************************************
2 **
2 **
3 ** Copyright (C) 2014 Digia Plc
3 ** Copyright (C) 2014 Digia Plc
4 ** All rights reserved.
4 ** All rights reserved.
5 ** For any questions to Digia, please use contact form at http://qt.digia.com
5 ** For any questions to Digia, please use contact form at http://qt.digia.com
6 **
6 **
7 ** This file is part of the Qt Enterprise Charts Add-on.
7 ** This file is part of the Qt Enterprise Charts Add-on.
8 **
8 **
9 ** $QT_BEGIN_LICENSE$
9 ** $QT_BEGIN_LICENSE$
10 ** Licensees holding valid Qt Enterprise licenses may use this file in
10 ** Licensees holding valid Qt Enterprise licenses may use this file in
11 ** accordance with the Qt Enterprise License Agreement provided with the
11 ** accordance with the Qt Enterprise License Agreement provided with the
12 ** Software or, alternatively, in accordance with the terms contained in
12 ** Software or, alternatively, in accordance with the terms contained in
13 ** a written agreement between you and Digia.
13 ** a written agreement between you and Digia.
14 **
14 **
15 ** If you have questions regarding the use of this file, please use
15 ** If you have questions regarding the use of this file, please use
16 ** contact form at http://qt.digia.com
16 ** contact form at http://qt.digia.com
17 ** $QT_END_LICENSE$
17 ** $QT_END_LICENSE$
18 **
18 **
19 ****************************************************************************/
19 ****************************************************************************/
20
20
21 #ifndef QCHARTGLOBAL_H
21 #ifndef QCHARTGLOBAL_H
22 #define QCHARTGLOBAL_H
22 #define QCHARTGLOBAL_H
23
23
24 #include <qglobal.h>
24 #include <qglobal.h>
25
25
26 #define QTCOMMERCIALCHART_VERSION_STR "1.3.1"
26 #define QTCOMMERCIALCHART_VERSION_STR "1.4.0"
27 /*
27 /*
28 QTCOMMERCIALCHART_VERSION is (major << 16) + (minor << 8) + patch.
28 QTCOMMERCIALCHART_VERSION is (major << 16) + (minor << 8) + patch.
29 */
29 */
30 #define QTCOMMERCIALCHART_VERSION 0x010301
30 #define QTCOMMERCIALCHART_VERSION 0x010400
31 /*
31 /*
32 can be used like #if (QTCOMMERCIALCHART_VERSION >= QTCOMMERCIALCHART_VERSION_CHECK(1, 1, 0))
32 can be used like #if (QTCOMMERCIALCHART_VERSION >= QTCOMMERCIALCHART_VERSION_CHECK(1, 1, 0))
33 */
33 */
34 #define QTCOMMERCIALCHART_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
34 #define QTCOMMERCIALCHART_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
35
35
36 #if defined(QTCOMMERCIALCHART_LIBRARY)
36 #if defined(QTCOMMERCIALCHART_LIBRARY)
37 # define QTCOMMERCIALCHART_EXPORT Q_DECL_EXPORT
37 # define QTCOMMERCIALCHART_EXPORT Q_DECL_EXPORT
38 #else
38 #else
39 # define QTCOMMERCIALCHART_EXPORT Q_DECL_IMPORT
39 # define QTCOMMERCIALCHART_EXPORT Q_DECL_IMPORT
40 #endif
40 #endif
41
41
42 #if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QTCOMMERCIALCHART_LIBRARY)
42 #if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QTCOMMERCIALCHART_LIBRARY)
43 # define QTCOMMERCIALCHART_AUTOTEST_EXPORT Q_DECL_EXPORT
43 # define QTCOMMERCIALCHART_AUTOTEST_EXPORT Q_DECL_EXPORT
44 #elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QTCOMMERCIALCHART_LIBRARY)
44 #elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QTCOMMERCIALCHART_LIBRARY)
45 # define QTCOMMERCIALCHART_AUTOTEST_EXPORT Q_DECL_IMPORT
45 # define QTCOMMERCIALCHART_AUTOTEST_EXPORT Q_DECL_IMPORT
46 #else
46 #else
47 # define QTCOMMERCIALCHART_AUTOTEST_EXPORT
47 # define QTCOMMERCIALCHART_AUTOTEST_EXPORT
48 #endif
48 #endif
49
49
50 #ifdef QTCOMMERCIALCHART_STATICLIB
50 #ifdef QTCOMMERCIALCHART_STATICLIB
51 # undef QTCOMMERCIALCHART_EXPORT
51 # undef QTCOMMERCIALCHART_EXPORT
52 # undef QTCOMMERCIALCHART_AUTOTEST_EXPORT
52 # undef QTCOMMERCIALCHART_AUTOTEST_EXPORT
53 # define QTCOMMERCIALCHART_EXPORT
53 # define QTCOMMERCIALCHART_EXPORT
54 # define QTCOMMERCIALCHART_AUTOTEST_EXPORT
54 # define QTCOMMERCIALCHART_AUTOTEST_EXPORT
55 #endif
55 #endif
56
56
57 #define QTCOMMERCIALCHART_NAMESPACE QtCommercialChart
57 #define QTCOMMERCIALCHART_NAMESPACE QtCommercialChart
58
58
59 #ifdef QTCOMMERCIALCHART_NAMESPACE
59 #ifdef QTCOMMERCIALCHART_NAMESPACE
60 # define QTCOMMERCIALCHART_BEGIN_NAMESPACE namespace QTCOMMERCIALCHART_NAMESPACE {
60 # define QTCOMMERCIALCHART_BEGIN_NAMESPACE namespace QTCOMMERCIALCHART_NAMESPACE {
61 # define QTCOMMERCIALCHART_END_NAMESPACE }
61 # define QTCOMMERCIALCHART_END_NAMESPACE }
62 # define QTCOMMERCIALCHART_USE_NAMESPACE using namespace QTCOMMERCIALCHART_NAMESPACE;
62 # define QTCOMMERCIALCHART_USE_NAMESPACE using namespace QTCOMMERCIALCHART_NAMESPACE;
63 #else
63 #else
64 # define QTCOMMERCIALCHART_BEGIN_NAMESPACE
64 # define QTCOMMERCIALCHART_BEGIN_NAMESPACE
65 # define QTCOMMERCIALCHART_END_NAMESPACE
65 # define QTCOMMERCIALCHART_END_NAMESPACE
66 # define QTCOMMERCIALCHART_USE_NAMESPACE
66 # define QTCOMMERCIALCHART_USE_NAMESPACE
67 #endif
67 #endif
68
68
69 #if defined(DEVELOPMENT_BUILD) && !defined(QT_NO_DEBUG)
69 #if defined(DEVELOPMENT_BUILD) && !defined(QT_NO_DEBUG)
70 #include <stdarg.h>
70 #include <stdarg.h>
71 #include <QDebug>
71 #include <QDebug>
72
72
73 #define CHART_DEBUG chartDebug(3,__LINE__,__FILE__,__FUNCTION__)
73 #define CHART_DEBUG chartDebug(3,__LINE__,__FILE__,__FUNCTION__)
74
74
75 static inline QDebug chartDebug(int numargs,...)
75 static inline QDebug chartDebug(int numargs,...)
76 {
76 {
77 va_list valist;
77 va_list valist;
78 va_start(valist, numargs);
78 va_start(valist, numargs);
79 //for( int i = 0 ; i < numargs; i++ )
79 //for( int i = 0 ; i < numargs; i++ )
80 int line = va_arg(valist, int);
80 int line = va_arg(valist, int);
81 char *file = va_arg(valist, char *);
81 char *file = va_arg(valist, char *);
82 char *function = va_arg(valist, char *);
82 char *function = va_arg(valist, char *);
83 va_end(valist);
83 va_end(valist);
84 return qDebug() << QString().append(function).append("(").append(file).append(":%1)").arg(line);
84 return qDebug() << QString().append(function).append("(").append(file).append(":%1)").arg(line);
85 }
85 }
86 #endif
86 #endif
87
87
88 /*
88 /*
89 On Windows min and max conflict with standard macros
89 On Windows min and max conflict with standard macros
90 */
90 */
91 #ifdef Q_OS_WIN
91 #ifdef Q_OS_WIN
92 #ifndef NOMINMAX
92 #ifndef NOMINMAX
93 #define NOMINMAX
93 #define NOMINMAX
94 #endif
94 #endif
95 #endif
95 #endif
96
96
97 #endif // QCHARTGLOBAL_H
97 #endif // QCHARTGLOBAL_H
General Comments 0
You need to be logged in to leave comments. Login now