Liang Qi f82e508516 Merge remote-tracking branch 'origin/5.11' into dev ... Conflicts: mkspecs/features/qt_common.prf src/corelib/tools/qstring.cpp src/plugins/platforms/windows/qwindowsmousehandler.cpp src/widgets/widgets/qmainwindowlayout_p.h Change-Id: I5df613008f6336f69b257d08e49a133d033a9d65		2018-05-24 16:29:14 +02:00
..
access	Merge remote-tracking branch 'origin/5.11' into dev	2018-05-24 16:29:14 +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-14 14:51:46 +02:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00