Qt Forward Merge Bot 97417e8f28 Merge remote-tracking branch 'origin/5.14' into 5.15 ... Conflicts: .qmake.conf examples/widgets/widgets/imageviewer/imageviewer.cpp src/corelib/text/qchar.cpp src/corelib/time/qdatetime.cpp Change-Id: I9762f5c4ff650799219729d6aee79ac07ce9024a		2020-02-04 10:44:00 +01:00
..
mac	Xcode: Use output directory as SYMROOT when shadow-building	2019-12-12 14:56:31 +01:00
unix	Mark the old style unprefixed stream functions deprecated	2019-12-16 11:23:47 +01:00
win32	Merge remote-tracking branch 'origin/5.14' into 5.15	2020-02-04 10:44:00 +01:00
makefile.cpp	Purge the dep_cd_cmd parameter from callExtraCompilerDependCommand	2020-01-24 13:25:06 +01:00
makefile.h	Purge the dep_cd_cmd parameter from callExtraCompilerDependCommand	2020-01-24 13:25:06 +01: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