Liang Qi d0a0a3c041 Merge remote-tracking branch 'origin/5.10' into dev ... Conflicts: examples/network/fortuneclient/client.cpp examples/network/fortuneserver/server.cpp src/platformsupport/platformcompositor/qopenglcompositorbackingstore_p.h src/plugins/platforms/cocoa/qcocoabackingstore.h src/plugins/platforms/cocoa/qcocoaintegration.h src/plugins/platforms/cocoa/qcocoascreen.h src/plugins/platforms/ios/qiosbackingstore.h src/plugins/sqldrivers/oci/qsql_oci.cpp src/widgets/kernel/qwidgetwindow.cpp Change-Id: Ia6dd2c52d4a691b671cf9a2ffca70deccece8f10		2017-10-17 10:34:24 +02:00
..
access	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-17 10:34:24 +02:00
bearer	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-03-13 15:55:44 +01:00
kernel	A minor cleanup - fix a comment	2017-10-11 15:50:26 +00:00
socket	Merge remote-tracking branch 'origin/5.10' into dev	2017-09-26 16:14:54 +02:00
ssl	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-17 10:34:24 +02:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00