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 tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
BLACKLIST	Tests: Blacklist tests for ubuntu 14.04	2015-04-01 13:59:04 +00:00
qgraphicsproxywidget.pro	QGraphicsView tests: Remove QT_DISABLE_DEPRECATED_BEFORE=0.	2015-08-22 05:55:24 +00:00
tst_qgraphicsproxywidget.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-21 08:17:21 +01:00