Liang Qi 4159ee8405 Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: config.tests/unix/ptrsize.test configure src/corelib/global/qnamespace.h src/network/socket/qabstractsocket.cpp tests/auto/other/networkselftest/networkselftest.pro Change-Id: Ic78abb4a34f9068567cea876861d4220f5a07672		2015-11-04 20:18:14 +01:00
..
BLACKLIST	Tests: Use blacklist for tst_NetworkSelfTest::ftpProxyServer()	2015-10-22 13:45:09 +00:00
networkselftest.pro	Merge remote-tracking branch 'origin/5.6' into dev	2015-11-04 20:18:14 +01:00
tst_networkselftest.cpp	tests/auto/other: Remove some placeholder formatting.	2015-10-22 03:53:22 +00:00