##// END OF EJS Templates
Merge remote-tracking branch 'origin/5.6' into 5.7...
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

File last commit:

r2885:b0b6ace77823
r2898:03a6177a3223 merge master
Show More
linechart.pri
11 lines | 228 B | text/plain | TextLexer
Michal Klocek
Cleanup build setup...
r249 INCLUDEPATH += $$PWD
SOURCES += \
$$PWD/linechartitem.cpp \
Michal Klocek
Rename QLineChartSeries to QLineSeries
r349 $$PWD/qlineseries.cpp
Michal Klocek
Cleanup build setup...
r249
PRIVATE_HEADERS += \
Michal Klocek
Adds big fat pimpl to series classes...
r938 $$PWD/linechartitem_p.h \
$$PWD/qlineseries_p.h
Michal Klocek
Cleanup build setup...
r249
PUBLIC_HEADERS += \
Michal Klocek
Rename QLineChartSeries to QLineSeries
r349 $$PWD/qlineseries.h