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

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

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