Liang Qi c7934f2489 Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: src/corelib/io/qprocess.cpp src/corelib/io/qprocess_unix.cpp src/network/kernel/qnetworkinterface_winrt.cpp tools/configure/configureapp.cpp Change-Id: I47df00a01597d2e63b334b492b3b4221b29f58ea		2015-11-18 09:01:51 +01:00
..
access	Merge remote-tracking branch 'origin/5.6' into dev	2015-11-18 09:01:51 +01: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