@@ -1,99 +1,97 | |||||
1 | ############################# BUILD CONFIG ###################################### |
|
1 | ############################# BUILD CONFIG ###################################### | |
2 |
|
2 | |||
3 | TARGET = QtCharts |
|
3 | TARGET = QtCharts | |
4 |
|
4 | |||
5 | QT = core gui widgets |
|
5 | QT = core gui widgets | |
6 | DEFINES += QT_CHARTS_LIBRARY |
|
6 | DEFINES += QT_CHARTS_LIBRARY | |
7 | # Fix exports in static builds for applications linking charts module |
|
7 | # Fix exports in static builds for applications linking charts module | |
8 | static: MODULE_DEFINES += QT_CHARTS_STATICLIB |
|
8 | static: MODULE_DEFINES += QT_CHARTS_STATICLIB | |
9 |
|
9 | |||
10 | MODULE_INCNAME = QtCharts |
|
|||
11 |
|
||||
12 | QMAKE_DOCS = $$PWD/doc/qtcharts.qdocconf |
|
10 | QMAKE_DOCS = $$PWD/doc/qtcharts.qdocconf | |
13 |
|
11 | |||
14 | QMAKE_TARGET_PRODUCT = "Qt Charts (Qt $$QT_VERSION)" |
|
12 | QMAKE_TARGET_PRODUCT = "Qt Charts (Qt $$QT_VERSION)" | |
15 | QMAKE_TARGET_DESCRIPTION = "Charts component for Qt." |
|
13 | QMAKE_TARGET_DESCRIPTION = "Charts component for Qt." | |
16 |
|
14 | |||
17 | ############################# SOURCES ########################################## |
|
15 | ############################# SOURCES ########################################## | |
18 |
|
16 | |||
19 | SOURCES += \ |
|
17 | SOURCES += \ | |
20 | $$PWD/chartdataset.cpp \ |
|
18 | $$PWD/chartdataset.cpp \ | |
21 | $$PWD/chartpresenter.cpp \ |
|
19 | $$PWD/chartpresenter.cpp \ | |
22 | $$PWD/chartthememanager.cpp \ |
|
20 | $$PWD/chartthememanager.cpp \ | |
23 | $$PWD/qchart.cpp \ |
|
21 | $$PWD/qchart.cpp \ | |
24 | $$PWD/qchartview.cpp \ |
|
22 | $$PWD/qchartview.cpp \ | |
25 | $$PWD/qabstractseries.cpp \ |
|
23 | $$PWD/qabstractseries.cpp \ | |
26 | $$PWD/chartbackground.cpp \ |
|
24 | $$PWD/chartbackground.cpp \ | |
27 | $$PWD/chartelement.cpp \ |
|
25 | $$PWD/chartelement.cpp \ | |
28 | $$PWD/chartitem.cpp \ |
|
26 | $$PWD/chartitem.cpp \ | |
29 | $$PWD/scroller.cpp \ |
|
27 | $$PWD/scroller.cpp \ | |
30 | $$PWD/charttitle.cpp \ |
|
28 | $$PWD/charttitle.cpp \ | |
31 | $$PWD/qpolarchart.cpp |
|
29 | $$PWD/qpolarchart.cpp | |
32 |
|
30 | |||
33 | contains(QT_CONFIG, opengl): SOURCES += $$PWD/glwidget.cpp |
|
31 | contains(QT_CONFIG, opengl): SOURCES += $$PWD/glwidget.cpp | |
34 |
|
32 | |||
35 | PRIVATE_HEADERS += \ |
|
33 | PRIVATE_HEADERS += \ | |
36 | $$PWD/chartdataset_p.h \ |
|
34 | $$PWD/chartdataset_p.h \ | |
37 | $$PWD/chartitem_p.h \ |
|
35 | $$PWD/chartitem_p.h \ | |
38 | $$PWD/chartpresenter_p.h \ |
|
36 | $$PWD/chartpresenter_p.h \ | |
39 | $$PWD/chartthememanager_p.h \ |
|
37 | $$PWD/chartthememanager_p.h \ | |
40 | $$PWD/chartbackground_p.h \ |
|
38 | $$PWD/chartbackground_p.h \ | |
41 | $$PWD/chartelement_p.h \ |
|
39 | $$PWD/chartelement_p.h \ | |
42 | $$PWD/chartconfig_p.h \ |
|
40 | $$PWD/chartconfig_p.h \ | |
43 | $$PWD/qchart_p.h \ |
|
41 | $$PWD/qchart_p.h \ | |
44 | $$PWD/qchartview_p.h \ |
|
42 | $$PWD/qchartview_p.h \ | |
45 | $$PWD/scroller_p.h \ |
|
43 | $$PWD/scroller_p.h \ | |
46 | $$PWD/qabstractseries_p.h \ |
|
44 | $$PWD/qabstractseries_p.h \ | |
47 | $$PWD/charttitle_p.h \ |
|
45 | $$PWD/charttitle_p.h \ | |
48 | $$PWD/charthelpers_p.h |
|
46 | $$PWD/charthelpers_p.h | |
49 |
|
47 | |||
50 | contains(QT_CONFIG, opengl): PRIVATE_HEADERS += $$PWD/glwidget_p.h |
|
48 | contains(QT_CONFIG, opengl): PRIVATE_HEADERS += $$PWD/glwidget_p.h | |
51 |
|
49 | |||
52 | PUBLIC_HEADERS += \ |
|
50 | PUBLIC_HEADERS += \ | |
53 | $$PWD/qchart.h \ |
|
51 | $$PWD/qchart.h \ | |
54 | $$PWD/qchartglobal.h \ |
|
52 | $$PWD/qchartglobal.h \ | |
55 | $$PWD/qabstractseries.h \ |
|
53 | $$PWD/qabstractseries.h \ | |
56 | $$PWD/qchartview.h \ |
|
54 | $$PWD/qchartview.h \ | |
57 | $$PWD/chartsnamespace.h \ |
|
55 | $$PWD/chartsnamespace.h \ | |
58 | $$PWD/qpolarchart.h |
|
56 | $$PWD/qpolarchart.h | |
59 |
|
57 | |||
60 | include($$PWD/animations/animations.pri) |
|
58 | include($$PWD/animations/animations.pri) | |
61 | include($$PWD/areachart/areachart.pri) |
|
59 | include($$PWD/areachart/areachart.pri) | |
62 | include($$PWD/axis/axis.pri) |
|
60 | include($$PWD/axis/axis.pri) | |
63 | include($$PWD/domain/domain.pri) |
|
61 | include($$PWD/domain/domain.pri) | |
64 | include($$PWD/barchart/barchart.pri) |
|
62 | include($$PWD/barchart/barchart.pri) | |
65 | include($$PWD/legend/legend.pri) |
|
63 | include($$PWD/legend/legend.pri) | |
66 | include($$PWD/linechart/linechart.pri) |
|
64 | include($$PWD/linechart/linechart.pri) | |
67 | include($$PWD/piechart/piechart.pri) |
|
65 | include($$PWD/piechart/piechart.pri) | |
68 | include($$PWD/scatterchart/scatter.pri) |
|
66 | include($$PWD/scatterchart/scatter.pri) | |
69 | include($$PWD/splinechart/splinechart.pri) |
|
67 | include($$PWD/splinechart/splinechart.pri) | |
70 | include($$PWD/themes/themes.pri) |
|
68 | include($$PWD/themes/themes.pri) | |
71 | include($$PWD/xychart/xychart.pri) |
|
69 | include($$PWD/xychart/xychart.pri) | |
72 | include($$PWD/layout/layout.pri) |
|
70 | include($$PWD/layout/layout.pri) | |
73 | include($$PWD/boxplotchart/boxplotchart.pri) |
|
71 | include($$PWD/boxplotchart/boxplotchart.pri) | |
74 |
|
72 | |||
75 | HEADERS += $$PUBLIC_HEADERS |
|
73 | HEADERS += $$PUBLIC_HEADERS | |
76 | HEADERS += $$PRIVATE_HEADERS |
|
74 | HEADERS += $$PRIVATE_HEADERS | |
77 | HEADERS += $$THEMES |
|
75 | HEADERS += $$THEMES | |
78 |
|
76 | |||
79 | OTHER_FILES += doc/qtcharts.qdocconf \ |
|
77 | OTHER_FILES += doc/qtcharts.qdocconf \ | |
80 | doc/src/* \ |
|
78 | doc/src/* \ | |
81 | doc/images/* |
|
79 | doc/images/* | |
82 |
|
80 | |||
83 | #Define for unit tests |
|
81 | #Define for unit tests | |
84 | CONFIG(debug, debug|release) { |
|
82 | CONFIG(debug, debug|release) { | |
85 | DEFINES += BUILD_PRIVATE_UNIT_TESTS |
|
83 | DEFINES += BUILD_PRIVATE_UNIT_TESTS | |
86 | } |
|
84 | } | |
87 |
|
85 | |||
88 | msvc { |
|
86 | msvc { | |
89 | # Suppress "conversion from 'size_t' to 'int', possible loss of data" warnings in 64bit |
|
87 | # Suppress "conversion from 'size_t' to 'int', possible loss of data" warnings in 64bit | |
90 | # builds resulting from usage of str::sort |
|
88 | # builds resulting from usage of str::sort | |
91 | QMAKE_CXXFLAGS_WARN_ON += -wd4267 |
|
89 | QMAKE_CXXFLAGS_WARN_ON += -wd4267 | |
92 | } |
|
90 | } | |
93 |
|
91 | |||
94 | win32:!winrt:!wince { |
|
92 | win32:!winrt:!wince { | |
95 | # ChartThemeSystem uses Windows native API |
|
93 | # ChartThemeSystem uses Windows native API | |
96 | LIBS += -luser32 |
|
94 | LIBS += -luser32 | |
97 | } |
|
95 | } | |
98 |
|
96 | |||
99 | load(qt_module) |
|
97 | load(qt_module) |
@@ -1,62 +1,55 | |||||
1 |
|
1 | |||
2 | TARGET = qtchartsqml2 |
|
2 | TARGET = qtchartsqml2 | |
3 | CXX_MODULE = charts |
|
3 | CXX_MODULE = charts | |
4 |
|
4 | |||
5 | QT += qml quick |
|
5 | QT += qml quick | |
6 | QT += charts charts-private |
|
6 | QT += charts charts-private | |
7 |
|
7 | |||
8 | # Only build qml plugin static if Qt itself is also built static |
|
8 | # Only build qml plugin static if Qt itself is also built static | |
9 | !contains(QT_CONFIG, static): CONFIG -= static staticlib |
|
9 | !contains(QT_CONFIG, static): CONFIG -= static staticlib | |
10 |
|
10 | |||
11 | include($$PWD/designer/designer.pri) |
|
11 | include($$PWD/designer/designer.pri) | |
12 |
|
12 | |||
13 | SOURCES += \ |
|
13 | SOURCES += \ | |
14 | chartsqml2_plugin.cpp \ |
|
14 | chartsqml2_plugin.cpp \ | |
15 | declarativechart.cpp \ |
|
15 | declarativechart.cpp \ | |
16 | declarativexypoint.cpp \ |
|
16 | declarativexypoint.cpp \ | |
17 | declarativexyseries.cpp \ |
|
17 | declarativexyseries.cpp \ | |
18 | declarativelineseries.cpp \ |
|
18 | declarativelineseries.cpp \ | |
19 | declarativesplineseries.cpp \ |
|
19 | declarativesplineseries.cpp \ | |
20 | declarativeareaseries.cpp \ |
|
20 | declarativeareaseries.cpp \ | |
21 | declarativescatterseries.cpp \ |
|
21 | declarativescatterseries.cpp \ | |
22 | declarativepieseries.cpp \ |
|
22 | declarativepieseries.cpp \ | |
23 | declarativebarseries.cpp \ |
|
23 | declarativebarseries.cpp \ | |
24 | declarativecategoryaxis.cpp \ |
|
24 | declarativecategoryaxis.cpp \ | |
25 | declarativemargins.cpp \ |
|
25 | declarativemargins.cpp \ | |
26 | declarativeaxes.cpp \ |
|
26 | declarativeaxes.cpp \ | |
27 | declarativepolarchart.cpp \ |
|
27 | declarativepolarchart.cpp \ | |
28 | declarativeboxplotseries.cpp \ |
|
28 | declarativeboxplotseries.cpp \ | |
29 | declarativechartnode.cpp \ |
|
29 | declarativechartnode.cpp \ | |
30 | declarativerendernode.cpp |
|
30 | declarativerendernode.cpp | |
31 |
|
31 | |||
32 | HEADERS += \ |
|
32 | HEADERS += \ | |
33 | declarativechart.h \ |
|
33 | declarativechart.h \ | |
34 | declarativexypoint.h \ |
|
34 | declarativexypoint.h \ | |
35 | declarativexyseries.h \ |
|
35 | declarativexyseries.h \ | |
36 | declarativelineseries.h \ |
|
36 | declarativelineseries.h \ | |
37 | declarativesplineseries.h \ |
|
37 | declarativesplineseries.h \ | |
38 | declarativeareaseries.h \ |
|
38 | declarativeareaseries.h \ | |
39 | declarativescatterseries.h \ |
|
39 | declarativescatterseries.h \ | |
40 | declarativepieseries.h \ |
|
40 | declarativepieseries.h \ | |
41 | declarativebarseries.h \ |
|
41 | declarativebarseries.h \ | |
42 | declarativecategoryaxis.h \ |
|
42 | declarativecategoryaxis.h \ | |
43 | declarativemargins.h \ |
|
43 | declarativemargins.h \ | |
44 | declarativeaxes.h \ |
|
44 | declarativeaxes.h \ | |
45 | declarativepolarchart.h \ |
|
45 | declarativepolarchart.h \ | |
46 | declarativeboxplotseries.h \ |
|
46 | declarativeboxplotseries.h \ | |
47 | declarativechartnode.h \ |
|
47 | declarativechartnode.h \ | |
48 | declarativerendernode.h |
|
48 | declarativerendernode.h | |
49 |
|
49 | |||
50 | OTHER_FILES = qmldir |
|
|||
51 |
|
||||
52 | load(qml_plugin) |
|
50 | load(qml_plugin) | |
53 |
|
51 | |||
54 | win32 { |
|
52 | win32 { | |
55 | CONFIG += skip_target_version_ext |
|
|||
56 | VERSION = $$MODULE_VERSION |
|
|||
57 | QMAKE_TARGET_PRODUCT = "Qt Charts (Qt $$QT_VERSION)" |
|
53 | QMAKE_TARGET_PRODUCT = "Qt Charts (Qt $$QT_VERSION)" | |
58 | QMAKE_TARGET_DESCRIPTION = "Charts QML plugin for Qt." |
|
54 | QMAKE_TARGET_DESCRIPTION = "Charts QML plugin for Qt." | |
59 | } |
|
55 | } | |
60 |
|
||||
61 | QML_FILES += \ |
|
|||
62 | $$PWD/plugins.qmltypes |
|
General Comments 0
You need to be logged in to leave comments.
Login now