Liang Qi 9419dfe8ee Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h src/plugins/platforms/xcb/qxcbwindow.cpp Change-Id: Ic747c3c50e68c005b425e7a1ec2a90965527c8bd		2017-04-04 18:09: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	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-03-13 15:55:44 +01: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