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

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

use standardized module export macros...
Oswald Buddenhagen -
r2891:17cb2cde9c6a
parent child
Show More
Side by Side Unified
Context file:
r2891:17cb2cde9c6a Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,97 +1,94
1 1 ############################# BUILD CONFIG ######################################
2 2
3 3 TARGET = QtCharts
4 4
5 5 QT = core gui widgets
6 DEFINES += QT_CHARTS_LIBRARY
7 # Fix exports in static builds for applications linking charts module
8 static: MODULE_DEFINES += QT_CHARTS_STATICLIB
9 6
10 7 QMAKE_DOCS = $$PWD/doc/qtcharts.qdocconf
11 8
12 9 QMAKE_TARGET_PRODUCT = "Qt Charts (Qt $$QT_VERSION)"
13 10 QMAKE_TARGET_DESCRIPTION = "Charts component for Qt."
14 11
15 12 ############################# SOURCES ##########################################
16 13
17 14 SOURCES += \
18 15 $$PWD/chartdataset.cpp \
19 16 $$PWD/chartpresenter.cpp \
20 17 $$PWD/chartthememanager.cpp \
21 18 $$PWD/qchart.cpp \
22 19 $$PWD/qchartview.cpp \
23 20 $$PWD/qabstractseries.cpp \
24 21 $$PWD/chartbackground.cpp \
25 22 $$PWD/chartelement.cpp \
26 23 $$PWD/chartitem.cpp \
27 24 $$PWD/scroller.cpp \
28 25 $$PWD/charttitle.cpp \
29 26 $$PWD/qpolarchart.cpp
30 27
31 28 contains(QT_CONFIG, opengl): SOURCES += $$PWD/glwidget.cpp
32 29
33 30 PRIVATE_HEADERS += \
34 31 $$PWD/chartdataset_p.h \
35 32 $$PWD/chartitem_p.h \
36 33 $$PWD/chartpresenter_p.h \
37 34 $$PWD/chartthememanager_p.h \
38 35 $$PWD/chartbackground_p.h \
39 36 $$PWD/chartelement_p.h \
40 37 $$PWD/chartconfig_p.h \
41 38 $$PWD/qchart_p.h \
42 39 $$PWD/qchartview_p.h \
43 40 $$PWD/scroller_p.h \
44 41 $$PWD/qabstractseries_p.h \
45 42 $$PWD/charttitle_p.h \
46 43 $$PWD/charthelpers_p.h
47 44
48 45 contains(QT_CONFIG, opengl): PRIVATE_HEADERS += $$PWD/glwidget_p.h
49 46
50 47 PUBLIC_HEADERS += \
51 48 $$PWD/qchart.h \
52 49 $$PWD/qchartglobal.h \
53 50 $$PWD/qabstractseries.h \
54 51 $$PWD/qchartview.h \
55 52 $$PWD/chartsnamespace.h \
56 53 $$PWD/qpolarchart.h
57 54
58 55 include($$PWD/animations/animations.pri)
59 56 include($$PWD/areachart/areachart.pri)
60 57 include($$PWD/axis/axis.pri)
61 58 include($$PWD/domain/domain.pri)
62 59 include($$PWD/barchart/barchart.pri)
63 60 include($$PWD/legend/legend.pri)
64 61 include($$PWD/linechart/linechart.pri)
65 62 include($$PWD/piechart/piechart.pri)
66 63 include($$PWD/scatterchart/scatter.pri)
67 64 include($$PWD/splinechart/splinechart.pri)
68 65 include($$PWD/themes/themes.pri)
69 66 include($$PWD/xychart/xychart.pri)
70 67 include($$PWD/layout/layout.pri)
71 68 include($$PWD/boxplotchart/boxplotchart.pri)
72 69
73 70 HEADERS += $$PUBLIC_HEADERS
74 71 HEADERS += $$PRIVATE_HEADERS
75 72 HEADERS += $$THEMES
76 73
77 74 OTHER_FILES += doc/qtcharts.qdocconf \
78 75 doc/src/* \
79 76 doc/images/*
80 77
81 78 #Define for unit tests
82 79 CONFIG(debug, debug|release) {
83 80 DEFINES += BUILD_PRIVATE_UNIT_TESTS
84 81 }
85 82
86 83 msvc {
87 84 # Suppress "conversion from 'size_t' to 'int', possible loss of data" warnings in 64bit
88 85 # builds resulting from usage of str::sort
89 86 QMAKE_CXXFLAGS_WARN_ON += -wd4267
90 87 }
91 88
92 89 win32:!winrt:!wince {
93 90 # ChartThemeSystem uses Windows native API
94 91 LIBS += -luser32
95 92 }
96 93
97 94 load(qt_module)
Show file before | Show file after | Hide comments
@@ -1,79 +1,77
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 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 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 #if defined(QT_CHARTS_LIBRARY)
38 # define QT_CHARTS_EXPORT Q_DECL_EXPORT
37 #ifndef QT_STATIC
38 # if defined(QT_BUILD_CHARTS_LIB)
39 # define QT_CHARTS_EXPORT Q_DECL_EXPORT
40 # else
41 # define QT_CHARTS_EXPORT Q_DECL_IMPORT
42 # endif
39 43 #else
40 # define QT_CHARTS_EXPORT Q_DECL_IMPORT
44 # define QT_CHARTS_EXPORT
41 45 #endif
42 46
43 #if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QT_CHARTS_LIBRARY)
47 #if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QT_BUILD_CHARTS_LIB)
44 48 # define QT_CHARTS_AUTOTEST_EXPORT Q_DECL_EXPORT
45 #elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QT_CHARTS_LIBRARY)
49 #elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QT_BUILD_CHARTS_LIB)
46 50 # define QT_CHARTS_AUTOTEST_EXPORT Q_DECL_IMPORT
47 51 #else
48 52 # define QT_CHARTS_AUTOTEST_EXPORT
49 53 #endif
50 54
51 #ifdef QT_CHARTS_STATICLIB
52 # undef QT_CHARTS_EXPORT
53 # undef QT_CHARTS_AUTOTEST_EXPORT
54 # define QT_CHARTS_EXPORT
55 # define QT_CHARTS_AUTOTEST_EXPORT
56 #endif
57 55
58 56 #define QT_CHARTS_NAMESPACE QtCharts
59 57
60 58 #ifdef QT_CHARTS_NAMESPACE
61 59 # define QT_CHARTS_BEGIN_NAMESPACE namespace QT_CHARTS_NAMESPACE {
62 60 # define QT_CHARTS_END_NAMESPACE }
63 61 # define QT_CHARTS_USE_NAMESPACE using namespace QT_CHARTS_NAMESPACE;
64 62 #else
65 63 # define QT_CHARTS_BEGIN_NAMESPACE
66 64 # define QT_CHARTS_END_NAMESPACE
67 65 # define QT_CHARTS_USE_NAMESPACE
68 66 #endif
69 67
70 68 /*
71 69 On Windows min and max conflict with standard macros
72 70 */
73 71 #ifdef Q_OS_WIN
74 72 #ifndef NOMINMAX
75 73 #define NOMINMAX
76 74 #endif
77 75 #endif
78 76
79 77 #endif // QCHARTGLOBAL_H
General Comments 0
You need to be logged in to leave comments. Login now