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

r2834:77545ecc2ba8
r2898:03a6177a3223 merge master
Show More
manual.pro
19 lines | 413 B | text/idl | PrologLexer
TEMPLATE = subdirs
SUBDIRS += \
presenterchart \
polarcharttest \
boxplottester
contains(QT_CONFIG, opengl) {
SUBDIRS += chartwidgettest \
wavechart \
chartviewer \
openglseriestest
} else {
message("OpenGL not available. Some test apps are disabled")
}
qtHaveModule(quick) {
SUBDIRS += qmlchartproperties \
qmlchartaxis
}