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

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

Bump version to 2.1.1...
Miikka Heikkinen -
r2877:35b800491709
parent child
Show More
Side by Side Unified
Context file:
r2877:35b800491709 Loading diff...:
Show file before | Show file after | Hide comments
@@ -0,0 +1,8
1 Qt Charts 2.1.1
2
3 Fixed issues
4 ------------
5 - Fixed crash with empty BarSet values
6 - Fixed model resetting with model mapper
7 - Fixed crash when axis range is infinite
8 - Fixed clearing the chart title
Show file before | Show file after | Hide comments
@@ -1,4 +1,4
1 1 load(qt_build_config)
2 2 CONFIG += qt_example_installs
3 3
4 MODULE_VERSION=2.1.0
4 MODULE_VERSION=2.1.1
Show file before | Show file after | Hide comments
@@ -1,78 +1,78
1 1 ---------------
2 Qt Charts 2.1.0
2 Qt Charts 2.1.1
3 3 ---------------
4 4
5 5 Qt Charts module provides a set of easy to use chart components. It uses
6 6 the Qt Graphics View Framework, therefore charts can be easily integrated
7 7 to modern user interfaces.
8 8
9 9 System Requirements
10 10 ===================
11 11
12 12 - Qt 5.4 or newer
13 13 - For QML applications QtQuick 2 is required
14 14 - Manipulating Qt Charts graphs with QML Designer requires Qt Creator 3.3 or newer
15 15
16 16 Building
17 17 ========
18 18
19 19 Configure the project with qmake:
20 20 qmake
21 21
22 22 After running qmake, build the project with make:
23 23 (Linux) make
24 24 (Windows with MinGw) mingw32-make
25 25 (Windows with Visual Studio) nmake
26 26 (OS X) make
27 27
28 28 The above generates the default makefiles for your configuration, which is typically
29 29 the release build if you are using precompiled binary Qt distribution. To build both
30 30 debug and release, or one specifically, use one of the following qmake lines instead.
31 31
32 32 For debug builds:
33 33 qmake CONFIG+=debug
34 34 make
35 35 or
36 36 qmake CONFIG+=debug_and_release
37 37 make debug
38 38
39 39 For release builds:
40 40 qmake CONFIG+=release
41 41 make
42 42 or
43 43 qmake CONFIG+=debug_and_release
44 44 make release
45 45
46 46 For both builds (Windows/OS X only):
47 47 qmake CONFIG+="debug_and_release build_all"
48 48 make
49 49
50 50 After building, install the module to your Qt directory:
51 51 make install
52 52
53 53 If you want to uninstall the module:
54 54 make uninstall
55 55
56 56 Building as a statically linked library
57 57 =======================================
58 58
59 59 The same as above applies, you will just have to add static to the CONFIG:
60 60 qmake CONFIG+=static
61 61
62 62 Documentation
63 63 =============
64 64
65 65 The documentation can be generated with:
66 66 make docs
67 67
68 68 The documentation is generated into the doc folder under the build folder.
69 69 Both Qt Assistant (qtcharts.qch) and in HTML format (qtcharts subfolder)
70 70 documentation is generated.
71 71
72 72 Please refer to the generated documentation for more information:
73 73 doc/qtcharts/index.html
74 74
75 75 Known issues
76 76 ============
77 77
78 78 - Zooming too far or too close may eventually freeze the zooming and scrolling.
Show file before | Show file after | Hide comments
@@ -1,79 +1,79
1 1 /******************************************************************************
2 2 **
3 3 ** Copyright (C) 2015 The Qt Company Ltd.
4 4 ** Contact: http://www.qt.io/licensing/
5 5 **
6 6 ** This file is part of the Qt Charts module.
7 7 **
8 8 ** $QT_BEGIN_LICENSE:COMM$
9 9 **
10 10 ** Commercial License Usage
11 11 ** Licensees holding valid commercial Qt licenses may use this file in
12 12 ** accordance with the commercial license agreement provided with the
13 13 ** Software or, alternatively, in accordance with the terms contained in
14 14 ** a written agreement between you and The Qt Company. For licensing terms
15 15 ** and conditions see http://www.qt.io/terms-conditions. For further
16 16 ** information use the contact form at http://www.qt.io/contact-us.
17 17 **
18 18 ** $QT_END_LICENSE$
19 19 **
20 20 ******************************************************************************/
21 21
22 22 #ifndef QCHARTGLOBAL_H
23 23 #define QCHARTGLOBAL_H
24 24
25 25 #include <QtCore/QtGlobal>
26 26
27 #define QT_CHARTS_VERSION_STR "2.1.0"
27 #define QT_CHARTS_VERSION_STR "2.1.1"
28 28 /*
29 29 QT_CHARTS_VERSION is (major << 16) + (minor << 8) + patch.
30 30 */
31 #define QT_CHARTS_VERSION 0x020100
31 #define QT_CHARTS_VERSION 0x020101
32 32 /*
33 33 can be used like #if (QT_CHARTS_VERSION >= QT_CHARTS_VERSION_CHECK(1, 1, 0))
34 34 */
35 35 #define QT_CHARTS_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
36 36
37 37 #if defined(QT_CHARTS_LIBRARY)
38 38 # define QT_CHARTS_EXPORT Q_DECL_EXPORT
39 39 #else
40 40 # define QT_CHARTS_EXPORT Q_DECL_IMPORT
41 41 #endif
42 42
43 43 #if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QT_CHARTS_LIBRARY)
44 44 # define QT_CHARTS_AUTOTEST_EXPORT Q_DECL_EXPORT
45 45 #elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QT_CHARTS_LIBRARY)
46 46 # define QT_CHARTS_AUTOTEST_EXPORT Q_DECL_IMPORT
47 47 #else
48 48 # define QT_CHARTS_AUTOTEST_EXPORT
49 49 #endif
50 50
51 51 #ifdef QT_CHARTS_STATICLIB
52 52 # undef QT_CHARTS_EXPORT
53 53 # undef QT_CHARTS_AUTOTEST_EXPORT
54 54 # define QT_CHARTS_EXPORT
55 55 # define QT_CHARTS_AUTOTEST_EXPORT
56 56 #endif
57 57
58 58 #define QT_CHARTS_NAMESPACE QtCharts
59 59
60 60 #ifdef QT_CHARTS_NAMESPACE
61 61 # define QT_CHARTS_BEGIN_NAMESPACE namespace QT_CHARTS_NAMESPACE {
62 62 # define QT_CHARTS_END_NAMESPACE }
63 63 # define QT_CHARTS_USE_NAMESPACE using namespace QT_CHARTS_NAMESPACE;
64 64 #else
65 65 # define QT_CHARTS_BEGIN_NAMESPACE
66 66 # define QT_CHARTS_END_NAMESPACE
67 67 # define QT_CHARTS_USE_NAMESPACE
68 68 #endif
69 69
70 70 /*
71 71 On Windows min and max conflict with standard macros
72 72 */
73 73 #ifdef Q_OS_WIN
74 74 #ifndef NOMINMAX
75 75 #define NOMINMAX
76 76 #endif
77 77 #endif
78 78
79 79 #endif // QCHARTGLOBAL_H
General Comments 0
You need to be logged in to leave comments. Login now