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
..
access	tst_QNetworkReply::ioGetFromBuiltinHttp - fix for large kernel buffers	2015-11-03 15:33:53 +00:00
bearer	tests/auto/network: Remove some placeholder formatting.	2015-10-19 12:38:28 +00:00
kernel	tests/auto/network: Remove some placeholder formatting.	2015-10-19 12:38:28 +00:00
socket	Merge remote-tracking branch 'origin/5.6' into dev	2015-11-04 20:18:14 +01:00
ssl	Merge remote-tracking branch 'origin/5.6' into dev	2015-11-04 20:18:14 +01:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00