| @@ -1,26 +1,25 | |||
|
|
1 | 1 | INCLUDEPATH += $$PWD |
|
|
2 | DEPENDPATH += $$PWD | |
|
|
3 | 2 | |
|
|
4 | 3 | SOURCES += \ |
|
|
5 | 4 | $$PWD/axisanimation.cpp \ |
|
|
6 | 5 | $$PWD/xyanimation.cpp \ |
|
|
7 | 6 | $$PWD/pieanimation.cpp \ |
|
|
8 | 7 | $$PWD/piesliceanimation.cpp \ |
|
|
9 | 8 | $$PWD/splineanimation.cpp \ |
|
|
10 | 9 | $$PWD/baranimation.cpp \ |
|
|
11 | 10 | $$PWD/scatteranimation.cpp \ |
|
|
12 | 11 | $$PWD/boxplotanimation.cpp \ |
|
|
13 | 12 | $$PWD/boxwhiskersanimation.cpp \ |
|
|
14 | 13 | $$PWD/chartanimation.cpp |
|
|
15 | 14 | |
|
|
16 | 15 | PRIVATE_HEADERS += \ |
|
|
17 | 16 | $$PWD/axisanimation_p.h \ |
|
|
18 | 17 | $$PWD/chartanimation_p.h \ |
|
|
19 | 18 | $$PWD/xyanimation_p.h \ |
|
|
20 | 19 | $$PWD/pieanimation_p.h \ |
|
|
21 | 20 | $$PWD/piesliceanimation_p.h \ |
|
|
22 | 21 | $$PWD/splineanimation_p.h \ |
|
|
23 | 22 | $$PWD/baranimation_p.h \ |
|
|
24 | 23 | $$PWD/scatteranimation_p.h \ |
|
|
25 | 24 | $$PWD/boxplotanimation_p.h \ |
|
|
26 | 25 | $$PWD/boxwhiskersanimation_p.h |
| @@ -1,13 +1,12 | |||
|
|
1 | 1 | INCLUDEPATH += $$PWD |
|
|
2 | DEPENDPATH += $$PWD | |
|
|
3 | 2 | |
|
|
4 | 3 | SOURCES += \ |
|
|
5 | 4 | $$PWD/areachartitem.cpp \ |
|
|
6 | 5 | $$PWD/qareaseries.cpp |
|
|
7 | 6 | |
|
|
8 | 7 | PRIVATE_HEADERS += \ |
|
|
9 | 8 | $$PWD/areachartitem_p.h \ |
|
|
10 | 9 | $$PWD/qareaseries_p.h |
|
|
11 | 10 | |
|
|
12 | 11 | PUBLIC_HEADERS += \ |
|
|
13 | 12 | $$PWD/qareaseries.h No newline at end of file |
| @@ -1,108 +1,99 | |||
|
|
1 | 1 | #Subdirectiores are defined here, because qt creator doesn't handle nested include(foo.pri) chains very well. |
|
|
2 | 2 | |
|
|
3 | 3 | INCLUDEPATH += $$PWD \ |
|
|
4 | 4 | $$PWD/valueaxis \ |
|
|
5 | 5 | $$PWD/barcategoryaxis \ |
|
|
6 | 6 | $$PWD/categoryaxis \ |
|
|
7 | 7 | $$PWD/logvalueaxis |
|
|
8 | 8 | |
|
|
9 | DEPENDPATH += $$PWD \ | |
|
|
10 | $$PWD/valueaxis \ | |
|
|
11 | $$PWD/barcategoryaxis \ | |
|
|
12 | $$PWD/categoryaxis \ | |
|
|
13 | $$PWD/logvalueaxis | |
|
|
14 | ||
|
|
15 | 9 | SOURCES += \ |
|
|
16 | 10 | $$PWD/chartaxiselement.cpp \ |
|
|
17 | 11 | $$PWD/cartesianchartaxis.cpp \ |
|
|
18 | 12 | $$PWD/qabstractaxis.cpp \ |
|
|
19 | 13 | $$PWD/verticalaxis.cpp \ |
|
|
20 | 14 | $$PWD/horizontalaxis.cpp \ |
|
|
21 | 15 | $$PWD/valueaxis/chartvalueaxisx.cpp \ |
|
|
22 | 16 | $$PWD/valueaxis/chartvalueaxisy.cpp \ |
|
|
23 | 17 | $$PWD/valueaxis/qvalueaxis.cpp \ |
|
|
24 | 18 | $$PWD/barcategoryaxis/chartbarcategoryaxisx.cpp \ |
|
|
25 | 19 | $$PWD/barcategoryaxis/chartbarcategoryaxisy.cpp \ |
|
|
26 | 20 | $$PWD/barcategoryaxis/qbarcategoryaxis.cpp \ |
|
|
27 | 21 | $$PWD/categoryaxis/chartcategoryaxisx.cpp \ |
|
|
28 | 22 | $$PWD/categoryaxis/chartcategoryaxisy.cpp \ |
|
|
29 | 23 | $$PWD/categoryaxis/qcategoryaxis.cpp \ |
|
|
30 | 24 | $$PWD/logvalueaxis/chartlogvalueaxisx.cpp \ |
|
|
31 | 25 | $$PWD/logvalueaxis/chartlogvalueaxisy.cpp \ |
|
|
32 | 26 | $$PWD/logvalueaxis/qlogvalueaxis.cpp |
|
|
33 | 27 | |
|
|
34 | 28 | PRIVATE_HEADERS += \ |
|
|
35 | 29 | $$PWD/chartaxiselement_p.h \ |
|
|
36 | 30 | $$PWD/cartesianchartaxis_p.h \ |
|
|
37 | 31 | $$PWD/qabstractaxis_p.h \ |
|
|
38 | 32 | $$PWD/verticalaxis_p.h \ |
|
|
39 | 33 | $$PWD/horizontalaxis_p.h \ |
|
|
40 | 34 | $$PWD/linearrowitem_p.h \ |
|
|
41 | 35 | $$PWD/valueaxis/chartvalueaxisx_p.h \ |
|
|
42 | 36 | $$PWD/valueaxis/chartvalueaxisy_p.h \ |
|
|
43 | 37 | $$PWD/valueaxis/qvalueaxis_p.h \ |
|
|
44 | 38 | $$PWD/barcategoryaxis/chartbarcategoryaxisx_p.h \ |
|
|
45 | 39 | $$PWD/barcategoryaxis/chartbarcategoryaxisy_p.h \ |
|
|
46 | 40 | $$PWD/barcategoryaxis/qbarcategoryaxis_p.h \ |
|
|
47 | 41 | $$PWD/categoryaxis/chartcategoryaxisx_p.h \ |
|
|
48 | 42 | $$PWD/categoryaxis/chartcategoryaxisy_p.h \ |
|
|
49 | 43 | $$PWD/categoryaxis/qcategoryaxis_p.h \ |
|
|
50 | 44 | $$PWD/logvalueaxis/chartlogvalueaxisx_p.h \ |
|
|
51 | 45 | $$PWD/logvalueaxis/chartlogvalueaxisy_p.h \ |
|
|
52 | 46 | $$PWD/logvalueaxis/qlogvalueaxis_p.h |
|
|
53 | 47 | |
|
|
54 | 48 | PUBLIC_HEADERS += \ |
|
|
55 | 49 | $$PWD/qabstractaxis.h \ |
|
|
56 | 50 | $$PWD/valueaxis/qvalueaxis.h \ |
|
|
57 | 51 | $$PWD/barcategoryaxis/qbarcategoryaxis.h \ |
|
|
58 | 52 | $$PWD/categoryaxis/qcategoryaxis.h \ |
|
|
59 | 53 | $$PWD/logvalueaxis/qlogvalueaxis.h \ |
|
|
60 | 54 | |
|
|
61 | 55 | # polar |
|
|
62 | 56 | SOURCES += \ |
|
|
63 | 57 | $$PWD/polarchartaxis.cpp \ |
|
|
64 | 58 | $$PWD/polarchartaxisangular.cpp \ |
|
|
65 | 59 | $$PWD/polarchartaxisradial.cpp \ |
|
|
66 | 60 | $$PWD/valueaxis/polarchartvalueaxisangular.cpp \ |
|
|
67 | 61 | $$PWD/valueaxis/polarchartvalueaxisradial.cpp \ |
|
|
68 | 62 | $$PWD/logvalueaxis/polarchartlogvalueaxisangular.cpp \ |
|
|
69 | 63 | $$PWD/logvalueaxis/polarchartlogvalueaxisradial.cpp \ |
|
|
70 | 64 | $$PWD/categoryaxis/polarchartcategoryaxisangular.cpp \ |
|
|
71 | 65 | $$PWD/categoryaxis/polarchartcategoryaxisradial.cpp |
|
|
72 | 66 | |
|
|
73 | 67 | PRIVATE_HEADERS += \ |
|
|
74 | 68 | $$PWD/polarchartaxis_p.h \ |
|
|
75 | 69 | $$PWD/polarchartaxisangular_p.h \ |
|
|
76 | 70 | $$PWD/polarchartaxisradial_p.h \ |
|
|
77 | 71 | $$PWD/valueaxis/polarchartvalueaxisangular_p.h \ |
|
|
78 | 72 | $$PWD/valueaxis/polarchartvalueaxisradial_p.h \ |
|
|
79 | 73 | $$PWD/logvalueaxis/polarchartlogvalueaxisangular_p.h \ |
|
|
80 | 74 | $$PWD/logvalueaxis/polarchartlogvalueaxisradial_p.h \ |
|
|
81 | 75 | $$PWD/categoryaxis/polarchartcategoryaxisangular_p.h \ |
|
|
82 | 76 | $$PWD/categoryaxis/polarchartcategoryaxisradial_p.h |
|
|
83 | 77 | |
|
|
84 | 78 | !contains(QT_COORD_TYPE, float): { |
|
|
85 | 79 | INCLUDEPATH += \ |
|
|
86 | 80 | $$PWD/datetimeaxis |
|
|
87 | 81 | |
|
|
88 | DEPENDPATH += \ | |
|
|
89 | $$PWD/datetimeaxis | |
|
|
90 | ||
|
|
91 | 82 | SOURCES += \ |
|
|
92 | 83 | $$PWD/datetimeaxis/chartdatetimeaxisx.cpp \ |
|
|
93 | 84 | $$PWD/datetimeaxis/chartdatetimeaxisy.cpp \ |
|
|
94 | 85 | $$PWD/datetimeaxis/qdatetimeaxis.cpp \ |
|
|
95 | 86 | $$PWD/datetimeaxis/polarchartdatetimeaxisangular.cpp \ |
|
|
96 | 87 | $$PWD/datetimeaxis/polarchartdatetimeaxisradial.cpp |
|
|
97 | 88 | |
|
|
98 | 89 | PRIVATE_HEADERS += \ |
|
|
99 | 90 | $$PWD/datetimeaxis/chartdatetimeaxisx_p.h \ |
|
|
100 | 91 | $$PWD/datetimeaxis/chartdatetimeaxisy_p.h \ |
|
|
101 | 92 | $$PWD/datetimeaxis/qdatetimeaxis_p.h \ |
|
|
102 | 93 | $$PWD/datetimeaxis/polarchartdatetimeaxisangular_p.h \ |
|
|
103 | 94 | $$PWD/datetimeaxis/polarchartdatetimeaxisradial_p.h |
|
|
104 | 95 | |
|
|
105 | 96 | PUBLIC_HEADERS += \ |
|
|
106 | 97 | $$PWD/datetimeaxis/qdatetimeaxis.h |
|
|
107 | 98 | } |
|
|
108 | 99 | |
| @@ -1,71 +1,63 | |||
|
|
1 | 1 | #Subdirectiores are defined here, because qt creator doesn't handle nested include(foo.pri) chains very well. |
|
|
2 | 2 | |
|
|
3 | 3 | INCLUDEPATH += $$PWD \ |
|
|
4 | 4 | $$PWD/vertical/bar \ |
|
|
5 | 5 | $$PWD/vertical/stacked \ |
|
|
6 | 6 | $$PWD/vertical/percent \ |
|
|
7 | 7 | $$PWD/horizontal/bar \ |
|
|
8 | 8 | $$PWD/horizontal/stacked \ |
|
|
9 | 9 | $$PWD/horizontal/percent |
|
|
10 | 10 | |
|
|
11 | DEPENDPATH += $$PWD \ | |
|
|
12 | $$PWD/vertical/bar \ | |
|
|
13 | $$PWD/vertical/stacked \ | |
|
|
14 | $$PWD/vertical/percent \ | |
|
|
15 | $$PWD/horizontal/bar \ | |
|
|
16 | $$PWD/horizontal/stacked \ | |
|
|
17 | $$PWD/horizontal/percent | |
|
|
18 | ||
|
|
19 | 11 | SOURCES += \ |
|
|
20 | 12 | $$PWD/bar.cpp \ |
|
|
21 | 13 | $$PWD/abstractbarchartitem.cpp \ |
|
|
22 | 14 | $$PWD/qabstractbarseries.cpp \ |
|
|
23 | 15 | $$PWD/qbarset.cpp \ |
|
|
24 | 16 | $$PWD/qbarmodelmapper.cpp \ |
|
|
25 | 17 | $$PWD/qvbarmodelmapper.cpp \ |
|
|
26 | 18 | $$PWD/qhbarmodelmapper.cpp \ |
|
|
27 | 19 | $$PWD/vertical/bar/qbarseries.cpp \ |
|
|
28 | 20 | $$PWD/vertical/bar/barchartitem.cpp \ |
|
|
29 | 21 | $$PWD/vertical/stacked/qstackedbarseries.cpp \ |
|
|
30 | 22 | $$PWD/vertical/stacked/stackedbarchartitem.cpp \ |
|
|
31 | 23 | $$PWD/vertical/percent/qpercentbarseries.cpp \ |
|
|
32 | 24 | $$PWD/vertical/percent/percentbarchartitem.cpp \ |
|
|
33 | 25 | $$PWD/horizontal/bar/qhorizontalbarseries.cpp \ |
|
|
34 | 26 | $$PWD/horizontal/bar/horizontalbarchartitem.cpp \ |
|
|
35 | 27 | $$PWD/horizontal/stacked/qhorizontalstackedbarseries.cpp \ |
|
|
36 | 28 | $$PWD/horizontal/stacked/horizontalstackedbarchartitem.cpp \ |
|
|
37 | 29 | $$PWD/horizontal/percent/qhorizontalpercentbarseries.cpp \ |
|
|
38 | 30 | $$PWD/horizontal/percent/horizontalpercentbarchartitem.cpp |
|
|
39 | 31 | |
|
|
40 | 32 | PRIVATE_HEADERS += \ |
|
|
41 | 33 | $$PWD/bar_p.h \ |
|
|
42 | 34 | $$PWD/qbarset_p.h \ |
|
|
43 | 35 | $$PWD/abstractbarchartitem_p.h \ |
|
|
44 | 36 | $$PWD/qabstractbarseries_p.h \ |
|
|
45 | 37 | $$PWD/qbarmodelmapper_p.h \ |
|
|
46 | 38 | $$PWD/vertical/bar/qbarseries_p.h \ |
|
|
47 | 39 | $$PWD/vertical/bar/barchartitem_p.h \ |
|
|
48 | 40 | $$PWD/vertical/stacked/qstackedbarseries_p.h \ |
|
|
49 | 41 | $$PWD/vertical/stacked/stackedbarchartitem_p.h \ |
|
|
50 | 42 | $$PWD/vertical/percent/qpercentbarseries_p.h \ |
|
|
51 | 43 | $$PWD/vertical/percent/percentbarchartitem_p.h \ |
|
|
52 | 44 | $$PWD/horizontal/bar/qhorizontalbarseries_p.h \ |
|
|
53 | 45 | $$PWD/horizontal/bar/horizontalbarchartitem_p.h \ |
|
|
54 | 46 | $$PWD/horizontal/stacked/qhorizontalstackedbarseries_p.h \ |
|
|
55 | 47 | $$PWD/horizontal/stacked/horizontalstackedbarchartitem_p.h \ |
|
|
56 | 48 | $$PWD/horizontal/percent/qhorizontalpercentbarseries_p.h \ |
|
|
57 | 49 | $$PWD/horizontal/percent/horizontalpercentbarchartitem_p.h |
|
|
58 | 50 | |
|
|
59 | 51 | PUBLIC_HEADERS += \ |
|
|
60 | 52 | $$PWD/qabstractbarseries.h \ |
|
|
61 | 53 | $$PWD/qbarset.h \ |
|
|
62 | 54 | $$PWD/qbarmodelmapper.h \ |
|
|
63 | 55 | $$PWD/qvbarmodelmapper.h \ |
|
|
64 | 56 | $$PWD/qhbarmodelmapper.h \ |
|
|
65 | 57 | $$PWD/vertical/bar/qbarseries.h \ |
|
|
66 | 58 | $$PWD/vertical/stacked/qstackedbarseries.h \ |
|
|
67 | 59 | $$PWD/vertical/percent/qpercentbarseries.h \ |
|
|
68 | 60 | $$PWD/horizontal/bar/qhorizontalbarseries.h \ |
|
|
69 | 61 | $$PWD/horizontal/stacked/qhorizontalstackedbarseries.h \ |
|
|
70 | 62 | $$PWD/horizontal/percent/qhorizontalpercentbarseries.h |
|
|
71 | 63 | |
| @@ -1,25 +1,24 | |||
|
|
1 | 1 | INCLUDEPATH += $$PWD |
|
|
2 | DEPENDPATH += $$PWD | |
|
|
3 | 2 | |
|
|
4 | 3 | SOURCES += \ |
|
|
5 | 4 | $$PWD/boxplotchartitem.cpp \ |
|
|
6 | 5 | $$PWD/qboxplotseries.cpp \ |
|
|
7 | 6 | $$PWD/boxwhiskers.cpp \ |
|
|
8 | 7 | $$PWD/qboxset.cpp \ |
|
|
9 | 8 | $$PWD/qboxplotmodelmapper.cpp \ |
|
|
10 | 9 | $$PWD/qvboxplotmodelmapper.cpp |
|
|
11 | 10 | |
|
|
12 | 11 | PRIVATE_HEADERS += \ |
|
|
13 | 12 | $$PWD/boxplotchartitem_p.h \ |
|
|
14 | 13 | $$PWD/qboxplotseries_p.h \ |
|
|
15 | 14 | $$PWD/boxwhiskers_p.h \ |
|
|
16 | 15 | $$PWD/boxwhiskersdata_p.h \ |
|
|
17 | 16 | $$PWD/qboxset_p.h \ |
|
|
18 | 17 | $$PWD/qboxplotmodelmapper_p.h |
|
|
19 | 18 | |
|
|
20 | 19 | PUBLIC_HEADERS += \ |
|
|
21 | 20 | $$PWD/qboxplotseries.h \ |
|
|
22 | 21 | $$PWD/qboxset.h \ |
|
|
23 | 22 | $$PWD/qboxplotmodelmapper.h \ |
|
|
24 | 23 | $$PWD/qvboxplotmodelmapper.h |
|
|
25 | 24 | |
| @@ -1,98 +1,90 | |||
|
|
1 | 1 | ############################# BUILD CONFIG ###################################### |
|
|
2 | 2 | |
|
|
3 | 3 | TARGET = QtCharts |
|
|
4 | 4 | |
|
|
5 | message($$QT_CONFIG) | |
|
|
6 | 5 | QT = core gui widgets |
|
|
7 | DEFINES += QT_CHARTS_LIBRARY | |
|
|
8 | 6 | contains(QT_COORD_TYPE, float): DEFINES += QT_QREAL_IS_FLOAT |
|
|
9 | 7 | |
|
|
10 | # Fix exports in static builds for applications linking charts module | |
|
|
11 | static: MODULE_DEFINES += QT_CHARTS_STATICLIB | |
|
|
12 | ||
|
|
13 | MODULE_INCNAME = QtCharts | |
|
|
14 | ||
|
|
15 | 8 | QMAKE_DOCS = $$PWD/doc/qtcharts.qdocconf |
|
|
16 | 9 | |
|
|
17 | load(qt_module) | |
|
|
18 | ||
|
|
19 | 10 | QMAKE_TARGET_PRODUCT = "Qt Charts (Qt $$QT_VERSION)" |
|
|
20 | 11 | QMAKE_TARGET_DESCRIPTION = "Charts component for Qt." |
|
|
21 | 12 | |
|
|
22 | 13 | ############################# SOURCES ########################################## |
|
|
23 | 14 | |
|
|
24 | 15 | SOURCES += \ |
|
|
25 | 16 | $$PWD/chartdataset.cpp \ |
|
|
26 | 17 | $$PWD/chartpresenter.cpp \ |
|
|
27 | 18 | $$PWD/chartthememanager.cpp \ |
|
|
28 | 19 | $$PWD/qchart.cpp \ |
|
|
29 | 20 | $$PWD/qchartview.cpp \ |
|
|
30 | 21 | $$PWD/qabstractseries.cpp \ |
|
|
31 | 22 | $$PWD/chartbackground.cpp \ |
|
|
32 | 23 | $$PWD/chartelement.cpp \ |
|
|
33 | 24 | $$PWD/chartitem.cpp \ |
|
|
34 | 25 | $$PWD/scroller.cpp \ |
|
|
35 | 26 | $$PWD/charttitle.cpp \ |
|
|
36 | 27 | $$PWD/qpolarchart.cpp |
|
|
37 | 28 | |
|
|
38 | 29 | contains(QT_CONFIG, opengl): SOURCES += $$PWD/glwidget.cpp |
|
|
39 | 30 | |
|
|
40 | 31 | PRIVATE_HEADERS += \ |
|
|
41 | 32 | $$PWD/chartdataset_p.h \ |
|
|
42 | 33 | $$PWD/chartitem_p.h \ |
|
|
43 | 34 | $$PWD/chartpresenter_p.h \ |
|
|
44 | 35 | $$PWD/chartthememanager_p.h \ |
|
|
45 | 36 | $$PWD/chartbackground_p.h \ |
|
|
46 | 37 | $$PWD/chartelement_p.h \ |
|
|
47 | 38 | $$PWD/chartconfig_p.h \ |
|
|
48 | 39 | $$PWD/qchart_p.h \ |
|
|
49 | 40 | $$PWD/qchartview_p.h \ |
|
|
50 | 41 | $$PWD/scroller_p.h \ |
|
|
51 | 42 | $$PWD/qabstractseries_p.h \ |
|
|
52 | 43 | $$PWD/charttitle_p.h \ |
|
|
53 | 44 | $$PWD/charthelpers_p.h |
|
|
54 | 45 | |
|
|
55 | 46 | contains(QT_CONFIG, opengl): PRIVATE_HEADERS += $$PWD/glwidget_p.h |
|
|
56 | 47 | |
|
|
57 | 48 | PUBLIC_HEADERS += \ |
|
|
58 | 49 | $$PWD/qchart.h \ |
|
|
59 | 50 | $$PWD/qchartglobal.h \ |
|
|
60 | 51 | $$PWD/qabstractseries.h \ |
|
|
61 | 52 | $$PWD/qchartview.h \ |
|
|
62 | 53 | $$PWD/chartsnamespace.h \ |
|
|
63 | 54 | $$PWD/qpolarchart.h |
|
|
64 | 55 | |
|
|
65 | include($$PWD/common.pri) | |
|
|
66 | 56 | include($$PWD/animations/animations.pri) |
|
|
67 | 57 | include($$PWD/areachart/areachart.pri) |
|
|
68 | 58 | include($$PWD/axis/axis.pri) |
|
|
69 | 59 | include($$PWD/domain/domain.pri) |
|
|
70 | 60 | include($$PWD/barchart/barchart.pri) |
|
|
71 | 61 | include($$PWD/legend/legend.pri) |
|
|
72 | 62 | include($$PWD/linechart/linechart.pri) |
|
|
73 | 63 | include($$PWD/piechart/piechart.pri) |
|
|
74 | 64 | include($$PWD/scatterchart/scatter.pri) |
|
|
75 | 65 | include($$PWD/splinechart/splinechart.pri) |
|
|
76 | 66 | include($$PWD/themes/themes.pri) |
|
|
77 | 67 | include($$PWD/xychart/xychart.pri) |
|
|
78 | 68 | include($$PWD/layout/layout.pri) |
|
|
79 | 69 | include($$PWD/boxplotchart/boxplotchart.pri) |
|
|
80 | 70 | |
|
|
81 | 71 | HEADERS += $$PUBLIC_HEADERS |
|
|
82 | 72 | HEADERS += $$PRIVATE_HEADERS |
|
|
83 | 73 | HEADERS += $$THEMES |
|
|
84 | 74 | |
|
|
85 | 75 | OTHER_FILES += doc/qtcharts.qdocconf \ |
|
|
86 | 76 | doc/src/* \ |
|
|
87 | 77 | doc/images/* |
|
|
88 | 78 | |
|
|
89 | 79 | msvc { |
|
|
90 | 80 | # Suppress "conversion from 'size_t' to 'int', possible loss of data" warnings in 64bit |
|
|
91 | 81 | # builds resulting from usage of str::sort |
|
|
92 | 82 | QMAKE_CXXFLAGS_WARN_ON += -wd4267 |
|
|
93 | 83 | } |
|
|
94 | 84 | |
|
|
95 | 85 | win32:!winrt:!wince { |
|
|
96 | 86 | # ChartThemeSystem uses Windows native API |
|
|
97 | 87 | LIBS += -luser32 |
|
|
98 | 88 | } |
|
|
89 | ||
|
|
90 | load(qt_module) | |
| @@ -1,28 +1,27 | |||
|
|
1 | 1 | #Subdirectiores are defined here, because qt creator doesn't handle nested include(foo.pri) chains very well. |
|
|
2 | 2 | |
|
|
3 | 3 | INCLUDEPATH += $$PWD |
|
|
4 | DEPENDPATH += $$PWD | |
|
|
5 | 4 | |
|
|
6 | 5 | SOURCES += \ |
|
|
7 | 6 | $$PWD/abstractdomain.cpp \ |
|
|
8 | 7 | $$PWD/polardomain.cpp \ |
|
|
9 | 8 | $$PWD/xydomain.cpp \ |
|
|
10 | 9 | $$PWD/xypolardomain.cpp \ |
|
|
11 | 10 | $$PWD/xlogydomain.cpp \ |
|
|
12 | 11 | $$PWD/xlogypolardomain.cpp \ |
|
|
13 | 12 | $$PWD/logxydomain.cpp \ |
|
|
14 | 13 | $$PWD/logxypolardomain.cpp \ |
|
|
15 | 14 | $$PWD/logxlogydomain.cpp \ |
|
|
16 | 15 | $$PWD/logxlogypolardomain.cpp |
|
|
17 | 16 | |
|
|
18 | 17 | PRIVATE_HEADERS += \ |
|
|
19 | 18 | $$PWD/abstractdomain_p.h \ |
|
|
20 | 19 | $$PWD/polardomain_p.h \ |
|
|
21 | 20 | $$PWD/xydomain_p.h \ |
|
|
22 | 21 | $$PWD/xypolardomain_p.h \ |
|
|
23 | 22 | $$PWD/xlogydomain_p.h \ |
|
|
24 | 23 | $$PWD/xlogypolardomain_p.h \ |
|
|
25 | 24 | $$PWD/logxydomain_p.h \ |
|
|
26 | 25 | $$PWD/logxypolardomain_p.h \ |
|
|
27 | 26 | $$PWD/logxlogydomain_p.h \ |
|
|
28 | 27 | $$PWD/logxlogypolardomain_p.h |
| @@ -1,12 +1,11 | |||
|
|
1 | 1 | INCLUDEPATH += $$PWD |
|
|
2 | DEPENDPATH += $$PWD | |
|
|
3 | 2 | |
|
|
4 | 3 | SOURCES += \ |
|
|
5 | 4 | $$PWD/abstractchartlayout.cpp \ |
|
|
6 | 5 | $$PWD/cartesianchartlayout.cpp \ |
|
|
7 | 6 | $$PWD/polarchartlayout.cpp |
|
|
8 | 7 | |
|
|
9 | 8 | PRIVATE_HEADERS += \ |
|
|
10 | 9 | $$PWD/abstractchartlayout_p.h \ |
|
|
11 | 10 | $$PWD/cartesianchartlayout_p.h \ |
|
|
12 | 11 | $$PWD/polarchartlayout_p.h |
| @@ -1,36 +1,35 | |||
|
|
1 | 1 | INCLUDEPATH += $$PWD |
|
|
2 | DEPENDPATH += $$PWD | |
|
|
3 | 2 | |
|
|
4 | 3 | SOURCES += \ |
|
|
5 | 4 | $$PWD/qlegend.cpp \ |
|
|
6 | 5 | $$PWD/legendlayout.cpp \ |
|
|
7 | 6 | $$PWD/qlegendmarker.cpp \ |
|
|
8 | 7 | $$PWD/qpielegendmarker.cpp \ |
|
|
9 | 8 | $$PWD/legendmarkeritem.cpp \ |
|
|
10 | 9 | $$PWD/qbarlegendmarker.cpp \ |
|
|
11 | 10 | $$PWD/qxylegendmarker.cpp \ |
|
|
12 | 11 | $$PWD/qarealegendmarker.cpp \ |
|
|
13 | 12 | $$PWD/legendscroller.cpp \ |
|
|
14 | 13 | $$PWD/qboxplotlegendmarker.cpp |
|
|
15 | 14 | |
|
|
16 | 15 | PRIVATE_HEADERS += \ |
|
|
17 | 16 | $$PWD/legendscroller_p.h \ |
|
|
18 | 17 | $$PWD/qlegend_p.h \ |
|
|
19 | 18 | $$PWD/legendlayout_p.h \ |
|
|
20 | 19 | $$PWD/qlegendmarker_p.h \ |
|
|
21 | 20 | $$PWD/legendmarkeritem_p.h \ |
|
|
22 | 21 | $$PWD/qpielegendmarker_p.h \ |
|
|
23 | 22 | $$PWD/qbarlegendmarker_p.h \ |
|
|
24 | 23 | $$PWD/qxylegendmarker_p.h \ |
|
|
25 | 24 | $$PWD/qarealegendmarker_p.h \ |
|
|
26 | 25 | $$PWD/qboxplotlegendmarker_p.h |
|
|
27 | 26 | |
|
|
28 | 27 | |
|
|
29 | 28 | PUBLIC_HEADERS += \ |
|
|
30 | 29 | $$PWD/qlegend.h \ |
|
|
31 | 30 | $$PWD/qlegendmarker.h \ |
|
|
32 | 31 | $$PWD/qpielegendmarker.h \ |
|
|
33 | 32 | $$PWD/qbarlegendmarker.h \ |
|
|
34 | 33 | $$PWD/qxylegendmarker.h \ |
|
|
35 | 34 | $$PWD/qarealegendmarker.h \ |
|
|
36 | 35 | $$PWD/qboxplotlegendmarker.h |
| @@ -1,13 +1,12 | |||
|
|
1 | 1 | INCLUDEPATH += $$PWD |
|
|
2 | DEPENDPATH += $$PWD | |
|
|
3 | 2 | |
|
|
4 | 3 | SOURCES += \ |
|
|
5 | 4 | $$PWD/linechartitem.cpp \ |
|
|
6 | 5 | $$PWD/qlineseries.cpp |
|
|
7 | 6 | |
|
|
8 | 7 | PRIVATE_HEADERS += \ |
|
|
9 | 8 | $$PWD/linechartitem_p.h \ |
|
|
10 | 9 | $$PWD/qlineseries_p.h |
|
|
11 | 10 | |
|
|
12 | 11 | PUBLIC_HEADERS += \ |
|
|
13 | 12 | $$PWD/qlineseries.h No newline at end of file |
| @@ -1,26 +1,25 | |||
|
|
1 | 1 | INCLUDEPATH += $$PWD |
|
|
2 | DEPENDPATH += $$PWD | |
|
|
3 | 2 | |
|
|
4 | 3 | SOURCES += \ |
|
|
5 | 4 | $$PWD/qpieseries.cpp \ |
|
|
6 | 5 | $$PWD/piesliceitem.cpp \ |
|
|
7 | 6 | $$PWD/piechartitem.cpp \ |
|
|
8 | 7 | $$PWD/qpieslice.cpp \ |
|
|
9 | 8 | $$PWD/qpiemodelmapper.cpp \ |
|
|
10 | 9 | $$PWD/qvpiemodelmapper.cpp \ |
|
|
11 | 10 | $$PWD/qhpiemodelmapper.cpp |
|
|
12 | 11 | |
|
|
13 | 12 | PRIVATE_HEADERS += \ |
|
|
14 | 13 | $$PWD/pieslicedata_p.h \ |
|
|
15 | 14 | $$PWD/piechartitem_p.h \ |
|
|
16 | 15 | $$PWD/piesliceitem_p.h \ |
|
|
17 | 16 | $$PWD/qpieslice_p.h \ |
|
|
18 | 17 | $$PWD/qpieseries_p.h \ |
|
|
19 | 18 | $$PWD/qpiemodelmapper_p.h |
|
|
20 | 19 | |
|
|
21 | 20 | PUBLIC_HEADERS += \ |
|
|
22 | 21 | $$PWD/qpieseries.h \ |
|
|
23 | 22 | $$PWD/qpieslice.h \ |
|
|
24 | 23 | $$PWD/qpiemodelmapper.h \ |
|
|
25 | 24 | $$PWD/qvpiemodelmapper.h \ |
|
|
26 | 25 | $$PWD/qhpiemodelmapper.h |
| @@ -1,79 +1,78 | |||
|
|
1 | 1 | /**************************************************************************** |
|
|
2 | 2 | ** |
|
|
3 | 3 | ** Copyright (C) 2016 The Qt Company Ltd. |
|
|
4 | 4 | ** Contact: https://www.qt.io/licensing/ |
|
|
5 | 5 | ** |
|
|
6 | 6 | ** This file is part of the Qt Charts module of the Qt Toolkit. |
|
|
7 | 7 | ** |
|
|
8 | 8 | ** $QT_BEGIN_LICENSE:GPL$ |
|
|
9 | 9 | ** Commercial License Usage |
|
|
10 | 10 | ** Licensees holding valid commercial Qt licenses may use this file in |
|
|
11 | 11 | ** accordance with the 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 The Qt Company. For licensing terms |
|
|
14 | 14 | ** and conditions see https://www.qt.io/terms-conditions. For further |
|
|
15 | 15 | ** information use the contact form at https://www.qt.io/contact-us. |
|
|
16 | 16 | ** |
|
|
17 | 17 | ** GNU General Public License Usage |
|
|
18 | 18 | ** Alternatively, this file may be used under the terms of the GNU |
|
|
19 | 19 | ** General Public License version 3 or (at your option) any later version |
|
|
20 | 20 | ** approved by the KDE Free Qt Foundation. The licenses are as published by |
|
|
21 | 21 | ** the Free Software Foundation and appearing in the file LICENSE.GPL3 |
|
|
22 | 22 | ** included in the packaging of this file. Please review the following |
|
|
23 | 23 | ** information to ensure the GNU General Public License requirements will |
|
|
24 | 24 | ** be met: https://www.gnu.org/licenses/gpl-3.0.html. |
|
|
25 | 25 | ** |
|
|
26 | 26 | ** $QT_END_LICENSE$ |
|
|
27 | 27 | ** |
|
|
28 | 28 | ****************************************************************************/ |
|
|
29 | 29 | |
|
|
30 | 30 | #ifndef QCHARTGLOBAL_H |
|
|
31 | 31 | #define QCHARTGLOBAL_H |
|
|
32 | 32 | |
|
|
33 | 33 | #include <QtCore/QtGlobal> |
|
|
34 | 34 | |
|
|
35 | 35 | #define QT_CHARTS_VERSION_STR QT_VERSION_STR |
|
|
36 | 36 | /* |
|
|
37 | 37 | QT_CHARTS_VERSION is (major << 16) + (minor << 8) + patch. |
|
|
38 | 38 | */ |
|
|
39 | 39 | #define QT_CHARTS_VERSION QT_VERSION |
|
|
40 | 40 | /* |
|
|
41 | 41 | can be used like #if (QT_CHARTS_VERSION >= QT_CHARTS_VERSION_CHECK(1, 1, 0)) |
|
|
42 | 42 | */ |
|
|
43 | 43 | #define QT_CHARTS_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) |
|
|
44 | 44 | |
|
|
45 | #if defined(QT_CHARTS_LIBRARY) | |
|
|
46 | # define QT_CHARTS_EXPORT Q_DECL_EXPORT | |
|
|
45 | #ifndef QT_STATIC | |
|
|
46 | # if defined(QT_BUILD_CHARTS_LIB) | |
|
|
47 | # define QT_CHARTS_EXPORT Q_DECL_EXPORT | |
|
|
48 | # else | |
|
|
49 | # define QT_CHARTS_EXPORT Q_DECL_IMPORT | |
|
|
50 | # endif | |
|
|
47 | 51 | #else |
|
|
48 | # define QT_CHARTS_EXPORT Q_DECL_IMPORT | |
|
|
49 | #endif | |
|
|
50 | ||
|
|
51 | #ifdef QT_CHARTS_STATICLIB | |
|
|
52 | # undef QT_CHARTS_EXPORT | |
|
|
53 | # undef Q_AUTOTEST_EXPORT | |
|
|
54 | 52 | # define QT_CHARTS_EXPORT |
|
|
55 | # define Q_AUTOTEST_EXPORT | |
|
|
56 | 53 | #endif |
|
|
57 | 54 | |
|
|
55 | #define QT_CHARTS_AUTOTEST_EXPORT Q_AUTOTEST_EXPORT | |
|
|
56 | ||
|
|
58 | 57 | #define QT_CHARTS_NAMESPACE QtCharts |
|
|
59 | 58 | |
|
|
60 | 59 | #ifdef QT_CHARTS_NAMESPACE |
|
|
61 | 60 | # define QT_CHARTS_BEGIN_NAMESPACE namespace QT_CHARTS_NAMESPACE { |
|
|
62 | 61 | # define QT_CHARTS_END_NAMESPACE } |
|
|
63 | 62 | # define QT_CHARTS_USE_NAMESPACE using namespace QT_CHARTS_NAMESPACE; |
|
|
64 | 63 | #else |
|
|
65 | 64 | # define QT_CHARTS_BEGIN_NAMESPACE |
|
|
66 | 65 | # define QT_CHARTS_END_NAMESPACE |
|
|
67 | 66 | # define QT_CHARTS_USE_NAMESPACE |
|
|
68 | 67 | #endif |
|
|
69 | 68 | |
|
|
70 | 69 | /* |
|
|
71 | 70 | On Windows min and max conflict with standard macros |
|
|
72 | 71 | */ |
|
|
73 | 72 | #ifdef Q_OS_WIN |
|
|
74 | 73 | #ifndef NOMINMAX |
|
|
75 | 74 | #define NOMINMAX |
|
|
76 | 75 | #endif |
|
|
77 | 76 | #endif |
|
|
78 | 77 | |
|
|
79 | 78 | #endif // QCHARTGLOBAL_H |
| @@ -1,13 +1,12 | |||
|
|
1 | 1 | INCLUDEPATH += $$PWD |
|
|
2 | DEPENDPATH += $$PWD | |
|
|
3 | 2 | |
|
|
4 | 3 | SOURCES += \ |
|
|
5 | 4 | $$PWD/qscatterseries.cpp \ |
|
|
6 | 5 | $$PWD/scatterchartitem.cpp |
|
|
7 | 6 | |
|
|
8 | 7 | PRIVATE_HEADERS += \ |
|
|
9 | 8 | $$PWD/scatterchartitem_p.h \ |
|
|
10 | 9 | $$PWD/qscatterseries_p.h |
|
|
11 | 10 | |
|
|
12 | 11 | PUBLIC_HEADERS += \ |
|
|
13 | 12 | $$PWD/qscatterseries.h |
| @@ -1,13 +1,12 | |||
|
|
1 | 1 | INCLUDEPATH += $$PWD |
|
|
2 | DEPENDPATH += $$PWD | |
|
|
3 | 2 | |
|
|
4 | 3 | SOURCES += \ |
|
|
5 | 4 | $$PWD/qsplineseries.cpp \ |
|
|
6 | 5 | $$PWD/splinechartitem.cpp |
|
|
7 | 6 | |
|
|
8 | 7 | PRIVATE_HEADERS += \ |
|
|
9 | 8 | $$PWD/splinechartitem_p.h \ |
|
|
10 | 9 | $$PWD/qsplineseries_p.h |
|
|
11 | 10 | |
|
|
12 | 11 | PUBLIC_HEADERS += \ |
|
|
13 | 12 | $$PWD/qsplineseries.h |
| @@ -1,14 +1,13 | |||
|
|
1 | 1 | INCLUDEPATH += $$PWD |
|
|
2 | DEPENDPATH += $$PWD | |
|
|
3 | 2 | |
|
|
4 | 3 | THEMES += \ |
|
|
5 | 4 | $$PWD/charttheme_p.h \ |
|
|
6 | 5 | $$PWD/chartthemesystem_p.h \ |
|
|
7 | 6 | $$PWD/chartthemelight_p.h \ |
|
|
8 | 7 | $$PWD/chartthemebluecerulean_p.h \ |
|
|
9 | 8 | $$PWD/chartthemedark_p.h \ |
|
|
10 | 9 | $$PWD/chartthemebrownsand_p.h \ |
|
|
11 | 10 | $$PWD/chartthemebluencs_p.h \ |
|
|
12 | 11 | $$PWD/chartthemehighcontrast_p.h \ |
|
|
13 | 12 | $$PWD/chartthemeblueicy_p.h \ |
|
|
14 | 13 | $$PWD/chartthemeqt_p.h |
| @@ -1,22 +1,21 | |||
|
|
1 |
|
|
|
|
2 | #DEPENDPATH += $$PWD | |
|
|
1 | INCLUDEPATH += $$PWD | |
|
|
3 | 2 | |
|
|
4 | 3 | SOURCES += \ |
|
|
5 | 4 | $$PWD/xychart.cpp \ |
|
|
6 | 5 | $$PWD/qxyseries.cpp \ |
|
|
7 | 6 | $$PWD/qxymodelmapper.cpp \ |
|
|
8 | 7 | $$PWD/qvxymodelmapper.cpp \ |
|
|
9 | 8 | $$PWD/qhxymodelmapper.cpp \ |
|
|
10 | 9 | $$PWD/glxyseriesdata.cpp |
|
|
11 | 10 | |
|
|
12 | 11 | PRIVATE_HEADERS += \ |
|
|
13 | 12 | $$PWD/xychart_p.h \ |
|
|
14 | 13 | $$PWD/qxyseries_p.h \ |
|
|
15 | 14 | $$PWD/qxymodelmapper_p.h \ |
|
|
16 | 15 | $$PWD/glxyseriesdata_p.h |
|
|
17 | 16 | |
|
|
18 | 17 | PUBLIC_HEADERS += \ |
|
|
19 | 18 | $$PWD/qxyseries.h \ |
|
|
20 | 19 | $$PWD/qxymodelmapper.h \ |
|
|
21 | 20 | $$PWD/qvxymodelmapper.h \ |
|
|
22 | 21 | $$PWD/qhxymodelmapper.h |
| @@ -1,73 +1,53 | |||
|
|
1 | 1 | |
|
|
2 | 2 | TARGET = qtchartsqml2 |
|
|
3 | CXX_MODULE = charts | |
|
|
4 | ||
|
|
3 | 5 | QT += qml quick |
|
|
4 | 6 | QT += charts charts-private |
|
|
5 | TARGETPATH = QtCharts | |
|
|
6 | 7 | contains(QT_COORD_TYPE, float): DEFINES += QT_QREAL_IS_FLOAT |
|
|
7 | 8 | |
|
|
8 | IMPORT_VERSION = $$MODULE_VERSION | |
|
|
9 | ||
|
|
10 | # Only build qml plugin static if Qt itself is also built static | |
|
|
11 | !contains(QT_CONFIG, static): CONFIG -= static staticlib | |
|
|
12 | ||
|
|
13 | 9 | include($$PWD/designer/designer.pri) |
|
|
14 | 10 | |
|
|
15 | INCLUDEPATH += ../../include \ | |
|
|
16 | ../../include/QtCharts \ | |
|
|
17 | ../charts \ | |
|
|
18 | ../charts/animations \ | |
|
|
19 | ../charts/axis \ | |
|
|
20 | ../charts/domain | |
|
|
21 | ||
|
|
22 | 11 | SOURCES += \ |
|
|
23 | 12 | chartsqml2_plugin.cpp \ |
|
|
24 | 13 | declarativechart.cpp \ |
|
|
25 | 14 | declarativexypoint.cpp \ |
|
|
26 | 15 | declarativexyseries.cpp \ |
|
|
27 | 16 | declarativelineseries.cpp \ |
|
|
28 | 17 | declarativesplineseries.cpp \ |
|
|
29 | 18 | declarativeareaseries.cpp \ |
|
|
30 | 19 | declarativescatterseries.cpp \ |
|
|
31 | 20 | declarativepieseries.cpp \ |
|
|
32 | 21 | declarativebarseries.cpp \ |
|
|
33 | 22 | declarativecategoryaxis.cpp \ |
|
|
34 | 23 | declarativemargins.cpp \ |
|
|
35 | 24 | declarativeaxes.cpp \ |
|
|
36 | 25 | declarativepolarchart.cpp \ |
|
|
37 | 26 | declarativeboxplotseries.cpp \ |
|
|
38 | 27 | declarativechartnode.cpp \ |
|
|
39 | 28 | declarativerendernode.cpp |
|
|
40 | 29 | |
|
|
41 | 30 | HEADERS += \ |
|
|
42 | 31 | declarativechart.h \ |
|
|
43 | 32 | declarativexypoint.h \ |
|
|
44 | 33 | declarativexyseries.h \ |
|
|
45 | 34 | declarativelineseries.h \ |
|
|
46 | 35 | declarativesplineseries.h \ |
|
|
47 | 36 | declarativeareaseries.h \ |
|
|
48 | 37 | declarativescatterseries.h \ |
|
|
49 | 38 | declarativepieseries.h \ |
|
|
50 | 39 | declarativebarseries.h \ |
|
|
51 | 40 | declarativecategoryaxis.h \ |
|
|
52 | 41 | declarativemargins.h \ |
|
|
53 | 42 | declarativeaxes.h \ |
|
|
54 | 43 | declarativepolarchart.h \ |
|
|
55 | 44 | declarativeboxplotseries.h \ |
|
|
56 | 45 | declarativechartnode.h \ |
|
|
57 | 46 | declarativerendernode.h |
|
|
58 | 47 | |
|
|
59 | OTHER_FILES = qmldir | |
|
|
60 | ||
|
|
61 | CONFIG += no_cxx_module | |
|
|
62 | ||
|
|
63 | 48 | load(qml_plugin) |
|
|
64 | 49 | |
|
|
65 | 50 | win32 { |
|
|
66 | CONFIG += skip_target_version_ext | |
|
|
67 | VERSION = $$MODULE_VERSION | |
|
|
68 | 51 | QMAKE_TARGET_PRODUCT = "Qt Charts (Qt $$QT_VERSION)" |
|
|
69 | 52 | QMAKE_TARGET_DESCRIPTION = "Charts QML plugin for Qt." |
|
|
70 | 53 | } |
|
|
71 | ||
|
|
72 | QML_FILES += \ | |
|
|
73 | $$PWD/plugins.qmltypes | |
|
|
1 | NO CONTENT: file was removed |
General Comments 0
You need to be logged in to leave comments.
Login now