Qt Forward Merge Bot 053e7cce79 Merge remote-tracking branch 'origin/5.11' into dev ... Conflicts: .qmake.conf src/corelib/doc/src/objectmodel/signalsandslots.qdoc src/plugins/platforms/cocoa/qcocoamenuloader.mm src/plugins/platforms/xcb/qxcbconnection.cpp src/plugins/platforms/xcb/qxcbconnection.h src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/plugins/platforms/xcb/qxcbwindow.cpp tests/auto/gui/image/qimage/tst_qimage.cpp Done-with: Gatis Paeglis <gatis.paeglis@qt.io> Change-Id: I9bd24ee9b00d4f26c8f344ce3970aa6e93935ff5		2018-08-07 17:44:51 +02:00
..
mac	qmake: Harden logic for handling the -o option	2018-07-31 10:13:31 +00:00
unix	Merge remote-tracking branch 'origin/5.11' into dev	2018-07-17 10:19:22 +02:00
win32	qmake: Harden logic for handling the -o option	2018-07-31 10:13:31 +00:00
makefile.cpp	Merge remote-tracking branch 'origin/5.11' into dev	2018-08-07 17:44:51 +02:00
makefile.h	qmake: fix lookup of .prl files for libs specified by full filename	2018-07-16 15:44:37 +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	qmake: Harden logic for handling the -o option	2018-07-31 10:13:31 +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