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

r1419:9a2b5d956bb6
r2878:97bb01ce5d85 merge
Show More
qsplineseries.pro
5 lines | 180 B | text/idl | PrologLexer
!include( ../auto.pri ) {
error( "Couldn't find the auto.pri file!" )
}
HEADERS += ../qxyseries/tst_qxyseries.h
SOURCES += tst_qsplineseries.cpp ../qxyseries/tst_qxyseries.cpp