##// 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/charts.pro src/charts/qchartglobal.h src/chartsqml2/chartsqml2.pro tests/auto/chartdataset/tst_chartdataset.cpp tests/auto/domain/tst_domain.cpp Change-Id: I9bfc63f6e93f9a3b86e53aca218dd3a48bb2ffc1

File last commit:

r2855:aa5aba329d30
r2898:03a6177a3223 merge master
Show More
auto.pri
10 lines | 220 B | text/plain | TextLexer
!include( ../tests.pri ) {
error( "Couldn't find the tests.pri file!" )
}
QT += testlib widgets
!contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_")
INCLUDEPATH += ../inc
HEADERS += ../inc/tst_definitions.h