Liang Qi 17198e03ab Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: qmake/doc/src/qmake-manual.qdoc src/corelib/global/qglobal.cpp src/corelib/tools/qstring.cpp src/network/socket/qabstractsocket.cpp src/network/socket/qnativesocketengine_unix.cpp src/plugins/platforms/eglfs/api/qeglfsglobal.h Change-Id: Id5dfdbd30fa996f9b4b66a0b030b7d3b8c0ef288		2016-08-16 07:58:32 +02:00
..
access	HTTP/2 - fix QT_NO_SSL build	2016-08-15 07:59:32 +00:00
bearer	Updated license headers	2016-01-21 18:55:18 +00:00
kernel	Long live QNetworkDatagram!	2016-06-20 16:11:35 +00:00
socket	Merge remote-tracking branch 'origin/5.7' into dev	2016-08-16 07:58:32 +02:00
ssl	Merge remote-tracking branch 'origin/5.7' into dev	2016-08-16 07:58:32 +02:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00