Liang Qi 4456984da7 Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: tests/auto/corelib/io/qfile/tst_qfile.cpp tests/auto/corelib/io/qprocess/tst_qprocess.cpp tests/auto/corelib/tools/qversionnumber/qversionnumber.pro Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e		2015-10-14 15:45:35 +02:00
..
.gitignore	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
qfontmetrics.pro	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
testfont.qrc	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
tst_qfontmetrics.cpp	Insert leading after each line, not before	2015-10-09 15:18:11 +00:00
ucs4font.ttf	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00