Liang Qi 6a36fe904c Merge remote-tracking branch 'origin/5.13' into 5.14 ... Conflicts: src/corelib/codecs/qicucodec.cpp src/dbus/qdbusserver.cpp src/gui/painting/qbezier.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp src/plugins/printsupport/cups/qppdprintdevice.cpp Change-Id: I2703128bb64baf5580fbc2c2061b55b0f0611d2a		2019-09-04 07:03:54 +02:00
..
mac	Merge remote-tracking branch 'origin/5.13' into dev	2019-06-14 13:45:18 +02:00
unix	Merge remote-tracking branch 'origin/5.13' into dev	2019-08-13 09:46:17 +02:00
win32	Merge remote-tracking branch 'origin/5.13' into 5.14	2019-09-04 07:03:54 +02:00
makefile.cpp	Remove dead QMakeSourceFileInfo caching feature from QMake	2019-08-20 20:27:52 +02:00
makefile.h	Warn about conflicting DESTDIR/TARGET combination in debug_and_release	2019-08-09 10:29:28 +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	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