Qt Forward Merge Bot 58c69df4d3 Merge remote-tracking branch 'origin/5.15' into dev ... Conflicts: src/corelib/tools/qhash.h src/gui/kernel/qevent.h src/widgets/kernel/qshortcut.cpp src/widgets/kernel/qshortcut.h Change-Id: If61c206ee43ad1d97f5b07f58ac93c4583ce5620		2019-11-25 11:30:04 +01:00
..
mac	Merge remote-tracking branch 'origin/5.13' into 5.14	2019-09-09 07:51:49 +00:00
unix	Merge remote-tracking branch 'origin/5.15' into dev	2019-11-25 11:30:04 +01:00
win32	Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"	2019-11-06 19:44:29 +01:00
makefile.cpp	Be able to create a response file for other generators too	2019-11-06 18:14:17 +01:00
makefile.h	Be able to create a response file for other generators too	2019-11-06 18:14:17 +01:00
makefiledeps.cpp	Remove QMakeLocalFileName::is_null	2019-08-30 12:30:26 +02:00
makefiledeps.h	Remove QMakeLocalFileName::is_null	2019-08-30 12:30:26 +02:00
metamakefile.cpp	qmake: Avoid writing glue project file when only generating prl files	2019-10-09 02:10:03 +02:00
metamakefile.h	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +00:00
projectgenerator.cpp	Merge remote-tracking branch 'origin/5.13' into 5.14	2019-09-04 07:03:54 +02:00
projectgenerator.h	Merge remote-tracking branch 'origin/5.13' into dev	2019-06-14 13:45:18 +02:00
xmloutput.cpp	Merge remote-tracking branch 'origin/5.13' into dev	2019-08-16 01:00:33 +02:00
xmloutput.h	Updated license headers	2016-01-21 18:55:18 +00:00