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

r2729:25ef6a257d39
r2893:0464d42b101e merge 5.7.0
Show More
cmake.pro
7 lines | 112 B | text/idl | PrologLexer
# Cause make to do nothing.
TEMPLATE = subdirs
CMAKE_QT_MODULES_UNDER_TEST = charts
CONFIG += ctest_testcase