Liang Qi 5d6073be27 Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: mkspecs/linux-icc/qmake.conf mkspecs/macx-icc/qmake.conf mkspecs/win32-icc/qmake.conf src/gui/painting/qgrayraster.c Change-Id: Ib08c45ea3215be05f986ecb3e1f4b37d209aa775		2017-04-07 10:24:33 +02:00
..
access	Use HTTP2WasUsedAttribute for HTTP2	2017-03-29 13:54:49 +00:00
bearer	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-03-13 15:55:44 +01:00
kernel	Fix network tests on qemu/arm	2017-04-06 12:19:46 +00:00
socket	Fix tst_QUdpSocket for QEMU	2017-03-29 14:29:43 +00:00
ssl	Merge remote-tracking branch 'origin/5.9' into dev	2017-04-04 18:09:33 +02:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00