Liang Qi 7f269a5db8 Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: .qmake.conf Change-Id: I43531e087bb810889d5c1fbfcdffb29b78804839		2017-07-06 13:54:25 +02:00
..
access	Fix some MSVC warnings in tests	2017-06-28 17:58:13 +00:00
bearer	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-03-13 15:55:44 +01:00
kernel	Merge remote-tracking branch 'origin/5.9' into dev	2017-07-04 16:05:53 +02:00
socket	Merge remote-tracking branch 'origin/5.9' into dev	2017-07-04 16:05:53 +02:00
ssl	Merge remote-tracking branch 'origin/5.9' into dev	2017-07-06 13:54:25 +02:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00