Liang Qi f4d8cafc1b Merge remote-tracking branch 'origin/5.10' into dev ... Conflicts: src/3rdparty/harfbuzz-ng/src/hb-private.hh src/sql/doc/snippets/code/doc_src_sql-driver.cpp src/sql/doc/src/sql-driver.qdoc Change-Id: I38f0e82fcd37926cbf3c1915e009a731040d4598		2018-01-11 18:10:41 +01:00
..
access	Merge remote-tracking branch 'origin/5.10' into dev	2018-01-11 18:10:41 +01:00
bearer	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-03-13 15:55:44 +01:00
kernel	Blacklist tst_QNetworkInterface::localAddress(linklocal-ipv4) in ci	2018-01-10 21:26:20 +00:00
socket	Merge remote-tracking branch 'origin/5.10' into dev	2018-01-11 18:10:41 +01:00
ssl	Enable brainpool curves in qsslkey tests	2018-01-10 13:25:25 +00:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00