Liang Qi e3ed2281c0 Merge remote-tracking branch 'origin/5.11' into dev ... Conflicts: src/plugins/platforms/cocoa/qnsview.mm src/plugins/platforms/cocoa/qnsview_dragging.mm src/plugins/platforms/ios/qiosinputcontext.mm src/plugins/platforms/xcb/qxcbconnection.cpp src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/plugins/platforms/xcb/qxcbwindow.cpp src/tools/androiddeployqt/main.cpp Was moved from qttools into qtbase in 5.11. So re-apply 32398e4d here. tests/auto/corelib/global/qlogging/test/test.pro tests/auto/corelib/global/qlogging/tst_qlogging.cpp tests/auto/corelib/io/qfile/tst_qfile.cpp tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp tests/auto/corelib/thread/qthreadstorage/test/test.pro tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp tests/auto/widgets/kernel/qapplication/test/test.pro Done-with: Gatis Paeglis <gatis.paeglis@qt.io> Done-with: Mårten Nordheim <marten.nordheim@qt.io> Done-with: Oliver Wolff <oliver.wolff@qt.io> Change-Id: Id970486c5315a1718c540f00deb2633533e8fc7b		2018-07-02 11:23:45 +02:00
..
access	Merge remote-tracking branch 'origin/5.11' into dev	2018-07-02 11:23:45 +02:00
bearer	Make tests compile for Android	2018-06-25 08:01:19 +00: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	DTLS cookie auto-test - do not check the exact UDP socket errors	2018-06-28 03:28:50 +00:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00