Liang Qi 158a3a4159 Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: src/corelib/io/qiodevice_p.h src/corelib/kernel/qvariant_p.h src/corelib/tools/qsimd.cpp src/gui/kernel/qguiapplication.cpp tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp Change-Id: I742a093cbb231b282b43e463ec67173e0d29f57a		2016-01-21 08:17:21 +01:00
..
.gitignore	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
BLACKLIST	Blacklist and skip various tests that are flakey	2015-06-14 10:50:45 +00:00
qtextdocumentlayout.pro	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
tst_qtextdocumentlayout.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-21 08:17:21 +01:00