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
..
image	tst_qpicture: Remove dependency on widgets	2018-05-24 10:35:43 +00:00
itemmodels	Make sure we can build with -no-feature-draganddrop	2018-05-29 18:31:35 +00:00
kernel	Merge remote-tracking branch 'origin/5.11' into dev	2018-07-02 11:23:45 +02:00
math3d	Use qRadiansToDegrees() and qDegreesToRadians() more widely	2017-07-05 10:15:34 +00:00
painting	Merge remote-tracking branch 'origin/5.11' into dev	2018-07-02 11:23:45 +02:00
qopengl	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-24 13:40:55 +02:00
qopenglconfig	Fix tst_QOpenGlConfig for platforms with builtin test data	2017-06-19 07:05:59 +00:00
qvulkan	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-17 10:34:24 +02:00
text	winrt: Fix/blacklist failing text related auto tests	2018-06-22 05:02:42 +00:00
util	QIntValidator: Intermediate for number if digits equal or less than max	2018-06-29 09:17:05 +00:00
gui.pro	winrt: Skip/blacklist failing opengl tests	2018-05-28 08:36:55 +00:00