diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-29 10:58:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-29 10:58:35 +0200 |
| commit | 03a6177a3223f928a5f329c8b1fc4d5fe376deed (patch) | |
| tree | ed57f892924d1bda89559682e34d4f86ec6d13fc /src/charts/barchart | |
| parent | 0464d42b101eaf60c62be751785009d09065f2cf (diff) | |
| parent | d137ae33ccf01882f80770919b1daa199dec7019 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/charts/charts.pro
src/charts/qchartglobal.h
src/chartsqml2/chartsqml2.pro
tests/auto/chartdataset/tst_chartdataset.cpp
tests/auto/domain/tst_domain.cpp
Change-Id: I9bfc63f6e93f9a3b86e53aca218dd3a48bb2ffc1
Diffstat (limited to 'src/charts/barchart')
| -rw-r--r-- | src/charts/barchart/barchart.pri | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/charts/barchart/barchart.pri b/src/charts/barchart/barchart.pri index 0e78d232..06123e6b 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 \ |