##// 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:

r2861:21c113d296ef
r2898:03a6177a3223 merge master
Show More
auto.pro
41 lines | 931 B | text/idl | PrologLexer
TEMPLATE = subdirs
SUBDIRS += \
qchartview \
qchart \
qlineseries \
qbarset \
qbarseries \
qstackedbarseries \
qpercentbarseries \
qpieslice qpieseries \
qpiemodelmapper \
qsplineseries \
qscatterseries \
qxymodelmapper \
qbarmodelmapper \
qhorizontalbarseries \
qhorizontalstackedbarseries \
qhorizontalpercentbarseries \
qvalueaxis \
qlogvalueaxis \
qcategoryaxis \
qbarcategoryaxis \
domain \
chartdataset \
qlegend \
cmake
!contains(QT_COORD_TYPE, float): {
SUBDIRS += \
qdatetimeaxis
}
qtHaveModule(quick) {
SUBDIRS += qml \
qml-qtquicktest
}
!contains(QT_CONFIG, private_tests): SUBDIRS -= \
domain \
chartdataset