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

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

Update version numbers to 1.3.0...
Miikka Heikkinen -
r2550:f50896eb9f2b
parent child
Show More
Side by Side Unified
Context file:
r2550:f50896eb9f2b Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,82 +1,82
1 1 !include(config.pri) {
2 2 error('Missing config.pri')
3 3 }
4 4
5 5 TEMPLATE = subdirs
6 6 SUBDIRS = src plugins demos examples tests
7 7
8 8 development_build: message('Development build')
9 9
10 10 CONFIG += ordered
11 11 QMAKE_CXXFLAGS += -g -Wall
12 12 unix:QMAKE_DISTCLEAN += -r build bin include lib doc/html
13 13 win32:QMAKE_DISTCLEAN += /Q /s build bin include lib doc\\html
14 14
15 15 # install feature file
16 16 feature.path = $$[QT_INSTALL_DATA]/mkspecs/features
17 17 feature.files = $$PWD/features/qtcommercialchart.prf
18 18 INSTALLS += feature
19 19
20 20 # docs
21 CHARTS_VERSION = 1.2.1
22 CHARTS_VERSION_TAG = 121
21 CHARTS_VERSION = 1.3.0
22 CHARTS_VERSION_TAG = 130
23 23
24 24 contains(QMAKE_HOST.os, Windows) {
25 25 QDOC_CONF = $$CHART_BUILD_DOC_DIR\\qcharts.qdocconf
26 26 win32-g++|qnx {
27 27 VERSION_SETTINGS = \
28 28 set QT_CHARTS_VERSION=$$CHARTS_VERSION&& set QT_CHARTS_VERSION_TAG=$$CHARTS_VERSION_TAG&&
29 29 } else {
30 30 VERSION_SETTINGS = \
31 31 set QT_CHARTS_VERSION=$$CHARTS_VERSION $$escape_expand(\\n\\t) \
32 32 set QT_CHARTS_VERSION_TAG=$$CHARTS_VERSION_TAG $$escape_expand(\\n\\t)
33 33 }
34 34 } else {
35 35 QDOC_CONF = $$CHART_BUILD_DOC_DIR/qcharts.qdocconf
36 36 VERSION_SETTINGS = \
37 37 QT_CHARTS_VERSION=$$CHARTS_VERSION QT_CHARTS_VERSION_TAG=$$CHARTS_VERSION_TAG
38 38 }
39 39
40 40 contains(QT_MAJOR_VERSION, 5) {
41 41 QDOC_CMD = qdoc
42 42 HELPGENERATOR_CMD = qhelpgenerator -platform minimal
43 43 } else {
44 44 QDOC_CMD = qdoc3
45 45 HELPGENERATOR_CMD = qhelpgenerator
46 46 }
47 47
48 48 QHP_FILE = doc/html/qtcommercialcharts.qhp
49 49 QCH_FILE = doc/qch/qtcommercialcharts.qch
50 50
51 51 docs.target = docs
52 52 docs.depends = qch_docs FORCE
53 53 qch_docs.target = qch_docs
54 54 qch_docs.commands = $$HELPGENERATOR_CMD $$QHP_FILE -o $$QCH_FILE
55 55 qch_docs.depends = html_docs FORCE
56 56 html_docs.target = html_docs
57 57 html_docs.commands = $$VERSION_SETTINGS $$QDOC_CMD $$QDOC_CONF
58 58 html_docs.depends = FORCE
59 59
60 60 QMAKE_EXTRA_TARGETS += docs qch_docs html_docs
61 61
62 62 # coverage
63 63 unix:coverage:{
64 64 QMAKE_DISTCLEAN += -r ./coverage
65 65 QMAKE_CLEAN += build/*.gcda build/*.gcno
66 66 QMAKE_EXTRA_TARGETS += buildcoverage runcoverage gencoverage
67 67
68 68 buildcoverage.target = build_coverage
69 69 buildcoverage.depends = all
70 70 buildcoverage.commands = mkdir -p ./coverage; \
71 71 make -C src prepare_coverage;
72 72
73 73 runcoverage.target = run_coverage
74 74 runcoverage.depends = buildcoverage
75 75 runcoverage.commands = for f in `ls ./bin/tst_*` ; do echo "processing \$\$f test..."; \$\$f >> unit.log; done ; exit 0;
76 76
77 77 gencoverage.target = gen_coverage
78 78 gencoverage.depends = runcoverage
79 79 gencoverage.commands = make -C src gen_coverage; \
80 80 genhtml -o ./coverage ./coverage/coverage.info --prefix $$PWD
81 81 }
82 82
Show file before | Show file after | Hide comments
@@ -1,88 +1,88
1 1 /****************************************************************************
2 2 **
3 3 ** Copyright (C) 2013 Digia Plc
4 4 ** All rights reserved.
5 5 ** For any questions to Digia, please use contact form at http://qt.digia.com
6 6 **
7 7 ** This file is part of the Qt Commercial Charts Add-on.
8 8 **
9 9 ** $QT_BEGIN_LICENSE$
10 10 ** Licensees holding valid Qt Commercial licenses may use this file in
11 11 ** accordance with the Qt Commercial License Agreement provided with the
12 12 ** Software or, alternatively, in accordance with the terms contained in
13 13 ** a written agreement between you and Digia.
14 14 **
15 15 ** If you have questions regarding the use of this file, please use
16 16 ** contact form at http://qt.digia.com
17 17 ** $QT_END_LICENSE$
18 18 **
19 19 ****************************************************************************/
20 20
21 21 #ifndef QCHARTGLOBAL_H
22 22 #define QCHARTGLOBAL_H
23 23
24 24 #include <qglobal.h>
25 25
26 #define QTCOMMERCIALCHART_VERSION_STR "1.2.1"
26 #define QTCOMMERCIALCHART_VERSION_STR "1.3.0"
27 27 /*
28 28 QTCOMMERCIALCHART_VERSION is (major << 16) + (minor << 8) + patch.
29 29 */
30 #define QTCOMMERCIALCHART_VERSION 0x010201
30 #define QTCOMMERCIALCHART_VERSION 0x010300
31 31 /*
32 32 can be used like #if (QTCOMMERCIALCHART_VERSION >= QTCOMMERCIALCHART_VERSION_CHECK(1, 1, 0))
33 33 */
34 34 #define QTCOMMERCIALCHART_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
35 35
36 36 #if defined(QTCOMMERCIALCHART_LIBRARY)
37 37 # define QTCOMMERCIALCHART_EXPORT Q_DECL_EXPORT
38 38 #else
39 39 # define QTCOMMERCIALCHART_EXPORT Q_DECL_IMPORT
40 40 #endif
41 41
42 42 #if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QTCOMMERCIALCHART_LIBRARY)
43 43 # define QTCOMMERCIALCHART_AUTOTEST_EXPORT Q_DECL_EXPORT
44 44 #elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QTCOMMERCIALCHART_LIBRARY)
45 45 # define QTCOMMERCIALCHART_AUTOTEST_EXPORT Q_DECL_IMPORT
46 46 #else
47 47 # define QTCOMMERCIALCHART_AUTOTEST_EXPORT
48 48 #endif
49 49
50 50 #ifdef QTCOMMERCIALCHART_STATICLIB
51 51 # undef QTCOMMERCIALCHART_EXPORT
52 52 # undef QTCOMMERCIALCHART_AUTOTEST_EXPORT
53 53 # define QTCOMMERCIALCHART_EXPORT
54 54 # define QTCOMMERCIALCHART_AUTOTEST_EXPORT
55 55 #endif
56 56
57 57 #define QTCOMMERCIALCHART_NAMESPACE QtCommercialChart
58 58
59 59 #ifdef QTCOMMERCIALCHART_NAMESPACE
60 60 # define QTCOMMERCIALCHART_BEGIN_NAMESPACE namespace QTCOMMERCIALCHART_NAMESPACE {
61 61 # define QTCOMMERCIALCHART_END_NAMESPACE }
62 62 # define QTCOMMERCIALCHART_USE_NAMESPACE using namespace QTCOMMERCIALCHART_NAMESPACE;
63 63 #else
64 64 # define QTCOMMERCIALCHART_BEGIN_NAMESPACE
65 65 # define QTCOMMERCIALCHART_END_NAMESPACE
66 66 # define QTCOMMERCIALCHART_USE_NAMESPACE
67 67 #endif
68 68
69 69 #if defined(DEVELOPMENT_BUILD) && !defined(QT_NO_DEBUG)
70 70 #include <stdarg.h>
71 71 #include <QDebug>
72 72
73 73 #define CHART_DEBUG chartDebug(3,__LINE__,__FILE__,__FUNCTION__)
74 74
75 75 static inline QDebug chartDebug(int numargs,...)
76 76 {
77 77 va_list valist;
78 78 va_start(valist, numargs);
79 79 //for( int i = 0 ; i < numargs; i++ )
80 80 int line = va_arg(valist, int);
81 81 char *file = va_arg(valist, char *);
82 82 char *function = va_arg(valist, char *);
83 83 va_end(valist);
84 84 return qDebug() << QString().append(function).append("(").append(file).append(":%1)").arg(line);
85 85 }
86 86 #endif
87 87
88 88 #endif // QCHARTGLOBAL_H
General Comments 0
You need to be logged in to leave comments. Login now