Qt Forward Merge Bot 1783fca897 Merge remote-tracking branch 'origin/5.11' into dev ... Conflicts: src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbintegration.cpp Conflicts git missed: src/plugins/platforms/qnx/qqnxglcontext.cpp Change-Id: I0582cdc9e66e43efe79038b9c43d4f9572ac88fc		2018-07-17 10:19:22 +02:00
..
mac	Merge remote-tracking branch 'origin/5.11' into dev	2018-07-17 10:19:22 +02:00
unix	Merge remote-tracking branch 'origin/5.11' into dev	2018-07-17 10:19:22 +02:00
win32	qmake: get rid of (some) makefile expansions in dependency paths	2018-07-16 15:44:44 +00:00
makefile.cpp	qmake: fix lookup of .prl files for libs specified by full filename	2018-07-16 15:44:37 +00: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	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