From 4c015da23a8e8e4fd5316d1f34480a095b9dd752 2016-05-19 18:49:47 From: Oswald Buddenhagen Date: 2016-05-19 18:49:47 Subject: [PATCH] clean up INCLUDEPATH handling in the c++ module, the .pri files add their directories, so there is no point in a centralized common.pri doing it again. the qml plugin doesn't need to add any paths from the c++ module explicitly, as the QT+=charts-private implies that already. Change-Id: I263dd702e9874e4d6188ca7251a482d0df4e570b Reviewed-by: Miikka Heikkinen Reviewed-by: Tomi Korpipää --- diff --git a/src/charts/charts.pro b/src/charts/charts.pro index 3db3f06..5e3f169 100644 --- a/src/charts/charts.pro +++ b/src/charts/charts.pro @@ -59,7 +59,6 @@ PUBLIC_HEADERS += \ $$PWD/chartsnamespace.h \ $$PWD/qpolarchart.h -include($$PWD/common.pri) include($$PWD/animations/animations.pri) include($$PWD/areachart/areachart.pri) include($$PWD/axis/axis.pri) diff --git a/src/charts/common.pri b/src/charts/common.pri deleted file mode 100644 index 1d5b649..0000000 --- a/src/charts/common.pri +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDEPATH += $$PWD/ \ - $$PWD/animations \ - $$PWD/areachart \ - $$PWD/axis \ - $$PWD/barchart \ - $$PWD/boxplotchart \ - $$PWD/domain \ - $$PWD/layout \ - $$PWD/legend \ - $$PWD/linechart \ - $$PWD/piechart \ - $$PWD/scatterchart \ - $$PWD/splinechart \ - $$PWD/themes \ - $$PWD/xychart diff --git a/src/charts/xychart/xychart.pri b/src/charts/xychart/xychart.pri index b12c33a..e314faa 100644 --- a/src/charts/xychart/xychart.pri +++ b/src/charts/xychart/xychart.pri @@ -1,4 +1,4 @@ -#INCLUDEPATH += $$PWD +INCLUDEPATH += $$PWD SOURCES += \ $$PWD/xychart.cpp \ diff --git a/src/chartsqml2/chartsqml2.pro b/src/chartsqml2/chartsqml2.pro index 5df0194..9603135 100644 --- a/src/chartsqml2/chartsqml2.pro +++ b/src/chartsqml2/chartsqml2.pro @@ -11,13 +11,6 @@ IMPORT_VERSION = $$MODULE_VERSION include($$PWD/designer/designer.pri) -INCLUDEPATH += ../../include \ - ../../include/QtCharts \ - ../charts \ - ../charts/animations \ - ../charts/axis \ - ../charts/domain - SOURCES += \ chartsqml2_plugin.cpp \ declarativechart.cpp \