qt5base-lts/tests/auto/network
Liang Qi 32f50225c4 Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	src/plugins/platforms/direct2d/direct2d.pro
	src/plugins/platforms/ios/qiosclipboard.mm
	src/plugins/platforms/windows/windows.pro

Change-Id: Idffa03b3990bd642784f528821c5446b2e1008ef
2017-10-23 09:40:54 +02:00
..
access Merge remote-tracking branch 'origin/5.9' into 5.10 2017-10-23 09:40:54 +02:00
bearer Merge remote-tracking branch 'origin/5.8' into 5.9 2017-03-13 15:55:44 +01:00
kernel MinGW: Globally define WINVER and _WIN32_WINNT to enable Windows 7 API 2017-10-19 10:58:59 +00:00
socket Merge remote-tracking branch 'origin/5.9' into 5.10 2017-09-06 13:26:31 +02:00
ssl Merge remote-tracking branch 'origin/5.9' into 5.10 2017-10-04 13:41:04 +02:00
network.pro Re-enable network tests on Mac OS. 2012-04-24 16:06:28 +02:00