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

r1805:3a0e948c9274
r2878:97bb01ce5d85 merge
Show More
qvalueaxis.pro
5 lines | 193 B | text/idl | PrologLexer
!include( ../auto.pri ) {
error( "Couldn't find the auto.pri file!" )
}
HEADERS += ../qabstractaxis/tst_qabstractaxis.h
SOURCES += tst_qvalueaxis.cpp ../qabstractaxis/tst_qabstractaxis.cpp