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

r1419:9a2b5d956bb6
r2893:0464d42b101e merge 5.7.0
Show More
qscatterseries.pro
4 lines | 174 B | text/idl | PrologLexer
!include( ../auto.pri ):error( "Couldn't find the auto.pri file!" )
HEADERS += ../qxyseries/tst_qxyseries.h
SOURCES += tst_qscatterseries.cpp ../qxyseries/tst_qxyseries.cpp