Liang Qi bc4cd465dd Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: qmake/Makefile.unix Change-Id: Ia18e391198222eef34ffa2df6f683e052058d032		2017-02-17 20:10:34 +01:00
..
access	Fix http2 auto-test	2017-02-15 14:11:19 +00:00
bearer	Merge remote-tracking branch 'origin/5.8' into dev	2017-01-25 20:06:06 +01:00
kernel	QHostAddress: add missing op!=(SpecialAddress, QHostAddress)	2017-01-26 16:44:02 +00:00
socket	tst_QSocks5SocketEngine: Refactor tests	2017-01-23 12:22:54 +00:00
ssl	qsslsocket_mac: handle 'OrLater' SslProtocols in verifySessionProtocol()	2017-02-13 21:44:05 +00:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00