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