Liang Qi 96a2044009 Merge remote-tracking branch 'origin/5.15' into dev ... Conflicts: src/network/access/qnetworkaccessmanager.cpp src/network/access/qnetworkreplyhttpimpl.cpp Change-Id: I059be651604623616fd31e8616be8ae61b4f8883		2019-10-04 15:27:15 +02:00
..
mac	Merge remote-tracking branch 'origin/5.13' into 5.14	2019-09-09 07:51:49 +00:00
unix	qmake: Place prl files under Resources in framework bundles	2019-10-03 11:11:20 +02:00
win32	Merge remote-tracking branch 'origin/5.13' into 5.14	2019-09-20 08:20:47 +02: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 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	Warn about conflicting DESTDIR/TARGET combination in debug_and_release	2019-08-09 10:29:28 +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