##// 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
scatter.pri
12 lines | 229 B | text/plain | TextLexer
Tero Ahola
Moved scatter impl into a subfolder
r194 INCLUDEPATH += $$PWD
SOURCES += \
$$PWD/qscatterseries.cpp \
Michal Klocek
Refactor scatter chart to fit the other classes...
r470 $$PWD/scatterchartitem.cpp
Tero Ahola
Moved scatter impl into a subfolder
r194
PRIVATE_HEADERS += \
Michal Klocek
Adds big fat pimpl to series classes...
r938 $$PWD/scatterchartitem_p.h \
$$PWD/qscatterseries_p.h
Tero Ahola
Moved scatter impl into a subfolder
r194
PUBLIC_HEADERS += \
$$PWD/qscatterseries.h