diff --git a/src/axis/axis.pri b/src/axis/axis.pri index f7a4c4e..a0c4011 100644 --- a/src/axis/axis.pri +++ b/src/axis/axis.pri @@ -1,17 +1,43 @@ -include(valuesaxis/valuesaxis.pri) -include(categoriesaxis/categoriesaxis.pri) -include(intervalsaxis/intervalsaxis.pri) +#Subdirectiores are defined here, because qt creator doesn't handle nested include(foo.pri) chains very well. -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD +INCLUDEPATH += $$PWD \ + $$PWD/valuesaxis \ + $$PWD/categoriesaxis \ + $$PWD/intervalsaxis + +DEPENDPATH += $$PWD \ + $$PWD/valuesaxis \ + $$PWD/categoriesaxis \ + $$PWD/intervalsaxis SOURCES += \ $$PWD/chartaxis.cpp \ - $$PWD/qabstractaxis.cpp - + $$PWD/qabstractaxis.cpp \ + $$PWD/valueaxis/chartvaluesaxisx.cpp \ + $$PWD/valueaxis/chartvaluesaxisy.cpp \ + $$PWD/valueaxis/qvaluesaxis.cpp \ + $$PWD/categoriesaxis/chartcategoriesaxisx.cpp \ + $$PWD/categoriesaxis/chartcategoriesaxisy.cpp \ + $$PWD/categoriesaxis/qbarcategoriesaxis.cpp \ + $$PWD/intervalsaxis/chartintervalsaxisx.cpp \ + $$PWD/intervalsaxis/chartintervalsaxisy.cpp \ + $$PWD/intervalsaxis/qintervalsaxis.cpp + PRIVATE_HEADERS += \ $$PWD/chartaxis_p.h \ - $$PWD/qabstractaxis_p.h + $$PWD/qabstractaxis_p.h \ + $$PWD/valueaxis/chartvaluesaxisx_p.h \ + $$PWD/valueaxis/chartvaluesaxisy_p.h \ + $$PWD/valueaxis/qvaluesaxis_p.h \ + $$PWD/categoriesaxis/chartcategoriesaxisx_p.h \ + $$PWD/categoriesaxis/chartcategoriesaxisy_p.h \ + $$PWD/categoriesaxis/qbarcategoriesaxis_p.h \ + $$PWD/intervalsaxis/chartintervalsaxisx_p.h \ + $$PWD/intervalsaxis/chartintervalsaxisy_p.h \ + $$PWD/intervalsaxis/qintervalsaxis_p.h PUBLIC_HEADERS += \ - $$PWD/qabstractaxis.h + $$PWD/qabstractaxis.h \ + $$PWD/valueaxis/qvaluesaxis.h \ + $$PWD/categoriesaxis/qbarcategoriesaxis.h \ + $$PWD/intervalsaxis/qintervalsaxis.h diff --git a/src/axis/categoriesaxis/categoriesaxis.pri b/src/axis/categoriesaxis/categoriesaxis.pri deleted file mode 100644 index 2a40483..0000000 --- a/src/axis/categoriesaxis/categoriesaxis.pri +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD - -SOURCES += \ - $$PWD/chartcategoriesaxisx.cpp \ - $$PWD/chartcategoriesaxisy.cpp \ - $$PWD/qbarcategoriesaxis.cpp - -PRIVATE_HEADERS += \ - $$PWD/chartcategoriesaxisx_p.h \ - $$PWD/chartcategoriesaxisy_p.h \ - $$PWD/qbarcategoriesaxis_p.h - -PUBLIC_HEADERS += \ - $$PWD/qbarcategoriesaxis.h \ No newline at end of file diff --git a/src/axis/intervalsaxis/intervalsaxis.pri b/src/axis/intervalsaxis/intervalsaxis.pri deleted file mode 100644 index 01ecf1e..0000000 --- a/src/axis/intervalsaxis/intervalsaxis.pri +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD - -SOURCES += \ - $$PWD/chartintervalsaxisx.cpp \ - $$PWD/chartintervalsaxisy.cpp \ - $$PWD/qintervalsaxis.cpp - -PRIVATE_HEADERS += \ - $$PWD/chartintervalsaxisx_p.h \ - $$PWD/chartintervalsaxisy_p.h \ - $$PWD/qintervalsaxis_p.h - -PUBLIC_HEADERS += \ - $$PWD/qintervalsaxis.h diff --git a/src/axis/valuesaxis/valuesaxis.pri b/src/axis/valuesaxis/valuesaxis.pri deleted file mode 100644 index 18c037a..0000000 --- a/src/axis/valuesaxis/valuesaxis.pri +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD - -SOURCES += \ - $$PWD/chartvaluesaxisx.cpp \ - $$PWD/chartvaluesaxisy.cpp \ - $$PWD/qvaluesaxis.cpp \ - -PRIVATE_HEADERS += \ - $$PWD/chartvaluesaxisx_p.h \ - $$PWD/chartvaluesaxisy_p.h \ - $$PWD/qvaluesaxis_p.h - -PUBLIC_HEADERS += \ - $$PWD/qvaluesaxis.h \ No newline at end of file diff --git a/src/barchart/barchart.pri b/src/barchart/barchart.pri index 3cd148c..0e78d23 100644 --- a/src/barchart/barchart.pri +++ b/src/barchart/barchart.pri @@ -1,8 +1,20 @@ -include(vertical/vertical.pri) -include(horizontal/horizontal.pri) +#Subdirectiores are defined here, because qt creator doesn't handle nested include(foo.pri) chains very well. -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD +INCLUDEPATH += $$PWD \ + $$PWD/vertical/bar \ + $$PWD/vertical/stacked \ + $$PWD/vertical/percent \ + $$PWD/horizontal/bar \ + $$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 \ @@ -12,17 +24,48 @@ SOURCES += \ $$PWD/qbarmodelmapper.cpp \ $$PWD/qvbarmodelmapper.cpp \ $$PWD/qhbarmodelmapper.cpp \ - + $$PWD/vertical/bar/qbarseries.cpp \ + $$PWD/vertical/bar/barchartitem.cpp \ + $$PWD/vertical/stacked/qstackedbarseries.cpp \ + $$PWD/vertical/stacked/stackedbarchartitem.cpp \ + $$PWD/vertical/percent/qpercentbarseries.cpp \ + $$PWD/vertical/percent/percentbarchartitem.cpp \ + $$PWD/horizontal/bar/qhorizontalbarseries.cpp \ + $$PWD/horizontal/bar/horizontalbarchartitem.cpp \ + $$PWD/horizontal/stacked/qhorizontalstackedbarseries.cpp \ + $$PWD/horizontal/stacked/horizontalstackedbarchartitem.cpp \ + $$PWD/horizontal/percent/qhorizontalpercentbarseries.cpp \ + $$PWD/horizontal/percent/horizontalpercentbarchartitem.cpp + PRIVATE_HEADERS += \ $$PWD/bar_p.h \ $$PWD/qbarset_p.h \ $$PWD/abstractbarchartitem_p.h \ $$PWD/qabstractbarseries_p.h \ - $$PWD/qbarmodelmapper_p.h + $$PWD/qbarmodelmapper_p.h \ + $$PWD/vertical/bar/qbarseries_p.h \ + $$PWD/vertical/bar/barchartitem_p.h \ + $$PWD/vertical/stacked/qstackedbarseries_p.h \ + $$PWD/vertical/stacked/stackedbarchartitem_p.h \ + $$PWD/vertical/percent/qpercentbarseries_p.h \ + $$PWD/vertical/percent/percentbarchartitem_p.h \ + $$PWD/horizontal/bar/qhorizontalbarseries_p.h \ + $$PWD/horizontal/bar/horizontalbarchartitem_p.h \ + $$PWD/horizontal/stacked/qhorizontalstackedbarseries_p.h \ + $$PWD/horizontal/stacked/horizontalstackedbarchartitem_p.h \ + $$PWD/horizontal/percent/qhorizontalpercentbarseries_p.h \ + $$PWD/horizontal/percent/horizontalpercentbarchartitem_p.h PUBLIC_HEADERS += \ $$PWD/qabstractbarseries.h \ $$PWD/qbarset.h \ $$PWD/qbarmodelmapper.h \ $$PWD/qvbarmodelmapper.h \ - $$PWD/qhbarmodelmapper.h + $$PWD/qhbarmodelmapper.h \ + $$PWD/vertical/bar/qbarseries.h \ + $$PWD/vertical/stacked/qstackedbarseries.h \ + $$PWD/vertical/percent/qpercentbarseries.h \ + $$PWD/horizontal/bar/qhorizontalbarseries.h \ + $$PWD/horizontal/stacked/qhorizontalstackedbarseries.h \ + $$PWD/horizontal/percent/qhorizontalpercentbarseries.h + diff --git a/src/barchart/horizontal/bar/bar.pri b/src/barchart/horizontal/bar/bar.pri deleted file mode 100644 index 897d649..0000000 --- a/src/barchart/horizontal/bar/bar.pri +++ /dev/null @@ -1,13 +0,0 @@ -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD - -SOURCES += \ - $$PWD/qhorizontalbarseries.cpp \ - $$PWD/horizontalbarchartitem.cpp - -PRIVATE_HEADERS += \ - $$PWD/qhorizontalbarseries_p.h \ - $$PWD/horizontalbarchartitem_p.h - -PUBLIC_HEADERS += \ - $$PWD/qhorizontalbarseries.h diff --git a/src/barchart/horizontal/horizontal.pri b/src/barchart/horizontal/horizontal.pri deleted file mode 100644 index cf5c716..0000000 --- a/src/barchart/horizontal/horizontal.pri +++ /dev/null @@ -1,3 +0,0 @@ -include(bar/bar.pri) -include(percent/percent.pri) -include(stacked/stacked.pri) \ No newline at end of file diff --git a/src/barchart/horizontal/percent/percent.pri b/src/barchart/horizontal/percent/percent.pri deleted file mode 100644 index cc7b6d2..0000000 --- a/src/barchart/horizontal/percent/percent.pri +++ /dev/null @@ -1,13 +0,0 @@ -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD - -SOURCES += \ - $$PWD/qhorizontalpercentbarseries.cpp \ - $$PWD/horizontalpercentbarchartitem.cpp - -PRIVATE_HEADERS += \ - $$PWD/qhorizontalpercentbarseries_p.h \ - $$PWD/horizontalpercentbarchartitem_p.h - -PUBLIC_HEADERS += \ - $$PWD/qhorizontalpercentbarseries.h diff --git a/src/barchart/horizontal/stacked/stacked.pri b/src/barchart/horizontal/stacked/stacked.pri deleted file mode 100644 index 0e1c101..0000000 --- a/src/barchart/horizontal/stacked/stacked.pri +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD - -SOURCES += \ - $$PWD/qhorizontalstackedbarseries.cpp \ - $$PWD/horizontalstackedbarchartitem.cpp - - -PRIVATE_HEADERS += \ - $$PWD/qhorizontalstackedbarseries_p.h \ - $$PWD/horizontalstackedbarchartitem_p.h - -PUBLIC_HEADERS += \ - $$PWD/qhorizontalstackedbarseries.h - diff --git a/src/barchart/vertical/bar/bar.pri b/src/barchart/vertical/bar/bar.pri deleted file mode 100644 index 9d63dfb..0000000 --- a/src/barchart/vertical/bar/bar.pri +++ /dev/null @@ -1,13 +0,0 @@ -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD - -SOURCES += \ - $$PWD/barchartitem.cpp \ - $$PWD/qbarseries.cpp - -PRIVATE_HEADERS += \ - $$PWD/barchartitem_p.h \ - $$PWD/qbarseries_p.h - -PUBLIC_HEADERS += \ - $$PWD/qbarseries.h diff --git a/src/barchart/vertical/percent/percent.pri b/src/barchart/vertical/percent/percent.pri deleted file mode 100644 index 8fac3c7..0000000 --- a/src/barchart/vertical/percent/percent.pri +++ /dev/null @@ -1,14 +0,0 @@ -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD - -SOURCES += \ - $$PWD/percentbarchartitem.cpp \ - $$PWD/qpercentbarseries.cpp - - -PRIVATE_HEADERS += \ - $$PWD/percentbarchartitem_p.h \ - $$PWD/qpercentbarseries_p.h - -PUBLIC_HEADERS += \ - $$PWD/qpercentbarseries.h diff --git a/src/barchart/vertical/stacked/stacked.pri b/src/barchart/vertical/stacked/stacked.pri deleted file mode 100644 index 8344ebe..0000000 --- a/src/barchart/vertical/stacked/stacked.pri +++ /dev/null @@ -1,13 +0,0 @@ -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD - -SOURCES += \ - $$PWD/qstackedbarseries.cpp \ - $$PWD/stackedbarchartitem.cpp - -PRIVATE_HEADERS += \ - $$PWD/stackedbarchartitem_p.h \ - $$PWD/qstackedbarseries_p.h - -PUBLIC_HEADERS += \ - $$PWD/qstackedbarseries.h diff --git a/src/barchart/vertical/vertical.pri b/src/barchart/vertical/vertical.pri deleted file mode 100644 index cf5c716..0000000 --- a/src/barchart/vertical/vertical.pri +++ /dev/null @@ -1,3 +0,0 @@ -include(bar/bar.pri) -include(percent/percent.pri) -include(stacked/stacked.pri) \ No newline at end of file