##// 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/doc/qtcharts.qdocconf Change-Id: If6160b2f643e7df8c32400b97afac229b95b78de

File last commit:

r2724:c26fb372333d
r2893:0464d42b101e merge 5.7.0
Show More
src.pro
6 lines | 105 B | text/idl | PrologLexer
TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS += charts
qtHaveModule(quick) {
SUBDIRS += chartsqml2
}