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
..
ipc	Merge remote-tracking branch 'origin/5.9' into 5.11	2018-02-14 12:51:24 +01:00
mimetypes	Merge remote-tracking branch 'origin/5.10' into dev	2018-01-20 22:36:19 +01:00
serialization	Example: add a simple CBOR dumper tool	2018-05-28 11:36:54 +00:00
threads	Merge remote-tracking branch 'origin/5.11' into dev	2018-07-02 11:23:45 +02:00
tools	Doc: Add missing full stops in briefs	2018-06-21 14:23:30 +00:00
corelib.pro	Create corelib/serialization and move existing file formats into it	2018-01-26 20:59:50 +00:00