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

r2712:c544258484ff
r2893:0464d42b101e merge 5.7.0
Show More
examples.pro
2 lines | 37 B | text/idl | PrologLexer
Michal Klocek
adds missing files form previous commit
r12 TEMPLATE = subdirs
Titta Heikkala
Qt Charts project file structure change...
r2712 SUBDIRS += charts