From b0b6ace77823df7ae32dbd2cd2e97eabf3475763 2016-05-19 18:49:45 From: Oswald Buddenhagen Date: 2016-05-19 18:49:45 Subject: [PATCH] prune redundant DEPENDPATH entries qt5 has depend_includepath enabled by default. Change-Id: I10ffcc9ff83a8b3c2252abe3dbdf7d0d40fcd4f2 Reviewed-by: Miikka Heikkinen Reviewed-by: Tomi Korpipää --- diff --git a/src/charts/animations/animations.pri b/src/charts/animations/animations.pri index 28b6db1..ccfafd8 100644 --- a/src/charts/animations/animations.pri +++ b/src/charts/animations/animations.pri @@ -1,5 +1,4 @@ INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD SOURCES += \ $$PWD/axisanimation.cpp \ diff --git a/src/charts/areachart/areachart.pri b/src/charts/areachart/areachart.pri index af5fa60..4f26f01 100644 --- a/src/charts/areachart/areachart.pri +++ b/src/charts/areachart/areachart.pri @@ -1,5 +1,4 @@ INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD SOURCES += \ $$PWD/areachartitem.cpp \ diff --git a/src/charts/axis/axis.pri b/src/charts/axis/axis.pri index 6f706aa..3479b3d 100644 --- a/src/charts/axis/axis.pri +++ b/src/charts/axis/axis.pri @@ -6,12 +6,6 @@ INCLUDEPATH += $$PWD \ $$PWD/categoryaxis \ $$PWD/logvalueaxis -DEPENDPATH += $$PWD \ - $$PWD/valueaxis \ - $$PWD/barcategoryaxis \ - $$PWD/categoryaxis \ - $$PWD/logvalueaxis - SOURCES += \ $$PWD/chartaxiselement.cpp \ $$PWD/cartesianchartaxis.cpp \ @@ -85,9 +79,6 @@ PRIVATE_HEADERS += \ INCLUDEPATH += \ $$PWD/datetimeaxis -DEPENDPATH += \ - $$PWD/datetimeaxis - SOURCES += \ $$PWD/datetimeaxis/chartdatetimeaxisx.cpp \ $$PWD/datetimeaxis/chartdatetimeaxisy.cpp \ diff --git a/src/charts/barchart/barchart.pri b/src/charts/barchart/barchart.pri index 0e78d23..06123e6 100644 --- a/src/charts/barchart/barchart.pri +++ b/src/charts/barchart/barchart.pri @@ -8,14 +8,6 @@ INCLUDEPATH += $$PWD \ $$PWD/horizontal/stacked \ $$PWD/horizontal/percent -DEPENDPATH += $$PWD \ - $$PWD/vertical/bar \ - $$PWD/vertical/stacked \ - $$PWD/vertical/percent \ - $$PWD/horizontal/bar \ - $$PWD/horizontal/stacked \ - $$PWD/horizontal/percent - SOURCES += \ $$PWD/bar.cpp \ $$PWD/abstractbarchartitem.cpp \ diff --git a/src/charts/boxplotchart/boxplotchart.pri b/src/charts/boxplotchart/boxplotchart.pri index db6e034..dffaf98 100644 --- a/src/charts/boxplotchart/boxplotchart.pri +++ b/src/charts/boxplotchart/boxplotchart.pri @@ -1,5 +1,4 @@ INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD SOURCES += \ $$PWD/boxplotchartitem.cpp \ diff --git a/src/charts/domain/domain.pri b/src/charts/domain/domain.pri index ab4fcfc..69a7b9f 100644 --- a/src/charts/domain/domain.pri +++ b/src/charts/domain/domain.pri @@ -1,7 +1,6 @@ #Subdirectiores are defined here, because qt creator doesn't handle nested include(foo.pri) chains very well. INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD SOURCES += \ $$PWD/abstractdomain.cpp \ diff --git a/src/charts/layout/layout.pri b/src/charts/layout/layout.pri index 159eab1..0400589 100644 --- a/src/charts/layout/layout.pri +++ b/src/charts/layout/layout.pri @@ -1,5 +1,4 @@ INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD SOURCES += \ $$PWD/abstractchartlayout.cpp \ diff --git a/src/charts/legend/legend.pri b/src/charts/legend/legend.pri index c14cf6b..73ff719 100644 --- a/src/charts/legend/legend.pri +++ b/src/charts/legend/legend.pri @@ -1,5 +1,4 @@ INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD SOURCES += \ $$PWD/qlegend.cpp \ diff --git a/src/charts/linechart/linechart.pri b/src/charts/linechart/linechart.pri index 573b23d..d0a0f9e 100644 --- a/src/charts/linechart/linechart.pri +++ b/src/charts/linechart/linechart.pri @@ -1,5 +1,4 @@ INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD SOURCES += \ $$PWD/linechartitem.cpp \ diff --git a/src/charts/piechart/piechart.pri b/src/charts/piechart/piechart.pri index 2c45c4e..d20d1a9 100644 --- a/src/charts/piechart/piechart.pri +++ b/src/charts/piechart/piechart.pri @@ -1,5 +1,4 @@ INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD SOURCES += \ $$PWD/qpieseries.cpp \ diff --git a/src/charts/scatterchart/scatter.pri b/src/charts/scatterchart/scatter.pri index fcbd119..e235c11 100644 --- a/src/charts/scatterchart/scatter.pri +++ b/src/charts/scatterchart/scatter.pri @@ -1,5 +1,4 @@ INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD SOURCES += \ $$PWD/qscatterseries.cpp \ diff --git a/src/charts/splinechart/splinechart.pri b/src/charts/splinechart/splinechart.pri index 4038685..b103625 100644 --- a/src/charts/splinechart/splinechart.pri +++ b/src/charts/splinechart/splinechart.pri @@ -1,5 +1,4 @@ INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD SOURCES += \ $$PWD/qsplineseries.cpp \ diff --git a/src/charts/themes/themes.pri b/src/charts/themes/themes.pri index 656552a..49b9735 100644 --- a/src/charts/themes/themes.pri +++ b/src/charts/themes/themes.pri @@ -1,5 +1,4 @@ INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD THEMES += \ $$PWD/charttheme_p.h \ diff --git a/src/charts/xychart/xychart.pri b/src/charts/xychart/xychart.pri index 1c5efb9..b12c33a 100644 --- a/src/charts/xychart/xychart.pri +++ b/src/charts/xychart/xychart.pri @@ -1,5 +1,4 @@ #INCLUDEPATH += $$PWD -#DEPENDPATH += $$PWD SOURCES += \ $$PWD/xychart.cpp \