Qt Forward Merge Bot e3cc16e9fb Merge remote-tracking branch 'origin/5.13' into 5.14 ... Conflicts: .qmake.conf mkspecs/features/mac/default_post.prf src/corelib/tools/qsimd_p.h src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm util/qfloat16-tables/gen_qfloat16_tables.cpp Change-Id: If48fa8a3bc3c983706b609a6d3822cb67c1352a4		2019-11-06 11:41:19 +01:00
..
mac	Merge remote-tracking branch 'origin/5.13' into 5.14	2019-09-09 07:51:49 +00:00
unix	Fix precompiled headers for Clang	2019-10-25 07:04:50 +00:00
win32	Merge remote-tracking branch 'origin/5.13' into 5.14	2019-11-06 11:41:19 +01:00
makefile.cpp	Merge remote-tracking branch 'origin/5.13' into 5.14	2019-09-20 08:20:47 +02:00
makefile.h	Merge remote-tracking branch 'origin/5.13' into 5.14	2019-09-20 08:20:47 +02:00
makefiledeps.cpp	Remove dead QMakeSourceFileInfo caching feature from QMake	2019-08-20 20:27:52 +02:00
makefiledeps.h	Remove dead QMakeSourceFileInfo caching feature from QMake	2019-08-20 20:27:52 +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