Liang Qi bce25a6340 Merge remote-tracking branch 'origin/5.7' into 5.8 ... Conflicts: src/gui/painting/qcoregraphics.mm src/gui/painting/qcoregraphics_p.h src/plugins/platforms/cocoa/qcocoahelpers.h src/plugins/platforms/cocoa/qcocoahelpers.mm Change-Id: Ibe5efcae73526b3d3931ed22730b13d372dcf54e		2016-11-25 14:41:29 +01:00
..
access	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-25 14:41:29 +01:00
bearer	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-01 06:02:55 +01:00
doc	Document Qt Network licenses	2016-10-24 09:44:57 +00:00
kernel	Add QNetworkProxy::usesSystemConfiguration() accessor	2016-11-02 08:04:14 +00:00
socket	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-24 10:31:21 +01:00
ssl	Remove last traces of MeeGo	2016-11-23 10:57:19 +00:00
configure.json	Don't set platform specific QT_NO_FOO defines in qglobal.h	2016-11-24 08:37:38 +00:00
configure.pri	Modularize configure.json/.pri	2016-09-15 08:23:53 +00:00
network.pro	Introduce SCTP sockets support	2016-07-27 06:37:24 +00:00