Liang Qi eaec2b664a Merge remote-tracking branch 'origin/5.8' into dev ... Conflicts: src/gui/painting/qcoregraphics.mm src/network/access/qnetworkrequest.h src/plugins/platforms/cocoa/qcocoahelpers.mm Change-Id: I81266414c06ea2edf63cbc7e93a86bd5d66a31a5		2016-09-21 09:11:02 +02:00
..
access	Merge remote-tracking branch 'origin/5.8' into dev	2016-09-21 09:11:02 +02:00
bearer	Updated license headers	2016-01-21 18:55:18 +00:00
kernel	Use qtConfig throughout in qtbase	2016-08-19 04:28:05 +00:00
socket	Modularize configure.json/.pri	2016-09-15 08:23:53 +00:00
ssl	Modularize configure.json/.pri	2016-09-15 08:23:53 +00:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00