##// 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
Michal Klocek
Qt name convetion: move test to tests
r1200 !include( ../tests.pri ) {
error( "Couldn't find the tests.pri file!" )
Tero Ahola
Created auto test specific pri
r960 }
Titta Heikkala
Fix include syntax...
r2714 QT += testlib widgets
Tero Ahola
Auto tests involving signal spys to wait before comparisons
r1109
Titta Heikkala
Qt Charts project file structure change...
r2712 !contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_")
Heikkinen Miikka
Fix autotests build for android...
r2524
Tero Ahola
Auto tests involving signal spys to wait before comparisons
r1109 INCLUDEPATH += ../inc
HEADERS += ../inc/tst_definitions.h