Liang Qi b5a956601f Merge remote-tracking branch 'origin/5.11' into dev ... Conflicts: src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp tests/auto/corelib/io/qresourceengine/qresourceengine_test.pro Change-Id: I3169f709cc2a1b75007cb23c02c4c79b74feeb04		2018-05-08 20:43:45 +02:00
..
access	Merge remote-tracking branch 'origin/5.11' into dev	2018-05-08 20:43:45 +02:00
bearer	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-03-13 15:55:44 +01:00
kernel	Narrow tst_QDnsLookup::lookup blacklist to only CI	2018-04-04 05:05:51 +00:00
socket	tests/auto/network: Avoid unconditional qWait()s	2018-05-08 12:35:40 +00:00
ssl	Merge remote-tracking branch 'origin/5.11' into dev	2018-05-08 20:43:45 +02:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00