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
..
q_func_info	Updated license headers	2016-01-21 18:55:18 +00:00
qflags	Declare the operator| in the Qt namespace for QFlags in that namespaces	2018-04-08 14:24:27 +00:00
qfloat16	Merge remote-tracking branch 'origin/5.10' into dev	2018-01-02 09:58:44 +01:00
qgetputenv	Long live qEnvironmentVariable()	2017-08-04 11:19:13 +00:00
qglobal	Fix thread_local test	2018-02-23 13:23:01 +00:00
qglobalstatic	tests: Unify license to GPL-EXCEPT	2017-04-03 07:18:46 +00:00
qhooks	tst_qhooks: test that it's possible to chain multiple hooks together	2016-11-18 15:22:32 +00:00
qlogging	Merge remote-tracking branch 'origin/5.11' into dev	2018-07-02 11:23:45 +02:00
qnumeric	Update the overflow functions to include qsizetype	2018-01-24 21:13:20 +00:00
qrand	Updated license headers	2016-01-21 18:55:18 +00:00
qrandomgenerator	Tests: Raise minimum supported MSVC version to 2015	2018-01-04 20:23:25 +00:00
qtendian	Move qle_bitfield to qendian_p.h	2017-06-27 22:16:56 +00:00
global.pro	Long live QRandomGenerator	2017-06-12 06:14:34 +00:00