Liang Qi 153e8b49ad Merge remote-tracking branch 'origin/5.10' into dev ... Conflicts: src/network/access/qhttp2protocolhandler_p.h src/network/kernel/kernel.pri src/network/ssl/qsslkey_qt.cpp src/plugins/platforms/cocoa/qcocoascreen.mm src/plugins/platforms/windows/accessible/iaccessible2.cpp src/plugins/platforms/windows/accessible/iaccessible2.h src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h src/widgets/widgets/qmenu_p.h tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp tests/auto/other/qaccessibility/tst_qaccessibility.cpp tests/auto/testlib/selftests/expected_cmptest.lightxml tests/auto/testlib/selftests/expected_cmptest.teamcity tests/auto/testlib/selftests/expected_cmptest.txt tests/auto/testlib/selftests/expected_cmptest.xml Done-with: Edward Welbourne <edward.welbourne@qt.io> Change-Id: I4217cc7d840cbae3e3dd28574741544469c4c6b9		2017-11-23 09:36:03 +01:00
..
stressTest	Fix some warnings in tests	2016-11-28 13:10:43 +00:00
test	Merge remote-tracking branch 'origin/5.7' into dev	2016-06-21 08:39:41 +02:00
.gitignore
BLACKLIST	tst_QTcpSocket: Replace insignification on Windows by BLACKLIST.	2016-06-10 21:48:54 +00:00
qtcpsocket.pro	tst_QTcpSocket::suddenRemoteDisconnect - fix flakyness	2017-10-30 11:10:10 +00:00
tst_qtcpsocket.cpp	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-23 09:36:03 +01:00