##// 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: .qmake.conf README src/charts/qchartglobal.h Change-Id: I20497b20947f589f9f73239a09ba6ea013b3597a

File last commit:

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