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
..
mac	xcode: Take effective platform name into account for configuration build dir	2018-06-06 10:51:41 +00:00
unix	qmake: use consistent path separators in makefile dependencies	2018-06-12 10:05:07 +00:00
win32	qmake: escape colons and hashmarks in dependency paths	2018-06-25 13:35:20 +00:00
makefile.cpp	Merge remote-tracking branch 'origin/5.11' into dev	2018-07-02 11:23:45 +02:00
makefile.h	qmake: escape colons and hashmarks in dependency paths	2018-06-25 13:35:20 +00:00
makefiledeps.cpp	Qmake: Fix compilation with QMAKE_USE_CACHE	2018-06-13 11:20:12 +00:00
makefiledeps.h	qmake: replace a uint:1 with a bool	2016-08-15 22:16:09 +00:00
metamakefile.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-29 17:55:20 +02:00
metamakefile.h	Updated license headers	2016-01-21 18:55:18 +00:00
projectgenerator.cpp	Pass the absolute path with the file when finding files	2017-06-19 08:39:40 +00:00
projectgenerator.h	qmake: escape colons and hashmarks in dependency paths	2018-06-25 13:35:20 +00:00
xmloutput.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-11 08:25:04 +01:00
xmloutput.h	Updated license headers	2016-01-21 18:55:18 +00:00