Qt Forward Merge Bot 0a4e5bb265 Merge remote-tracking branch 'origin/5.15' into dev ... Conflicts: src/widgets/kernel/qshortcut.cpp tests/auto/network/access/spdy/tst_spdy.cpp Change-Id: If76c434beac2c0a393440aa365f89f77439774ce		2020-01-16 11:20:42 +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	Fix dependency resolution for extra compilers in VS projects	2020-01-07 07:16:59 +01:00
makefile.cpp	Fix mkdir warning for object_parallel_to_source projects	2020-01-14 07:58:03 +01:00
makefile.h	Fix dependency resolution for extra compilers in VS projects	2020-01-07 07:16:59 +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