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