Liang Qi 388fe97f2a Merge remote-tracking branch 'origin/5.13' into dev ... Conflicts: src/corelib/tools/qstring.cpp Change-Id: I81dbf90fc936c9bf08197baefa071117bddb1c63		2019-05-13 08:04:58 +02:00
..
mac	Prefix textstream operators with Qt::	2019-05-02 11:52:02 +00:00
unix	Prefix textstream operators with Qt::	2019-05-02 11:52:02 +00:00
win32	Deprecate conversion functions between QList and QSet	2019-05-07 14:15:44 +00:00
makefile.cpp	Deprecate conversion functions between QList and QSet	2019-05-07 14:15:44 +00:00
makefile.h	Make the Makefile a dependency of default targets for nmake	2019-02-04 08:10:25 +00:00
makefiledeps.cpp	qmake: Distinguish local header files by directory and name	2019-05-07 08:41:09 +00:00
makefiledeps.h	qmake: replace a uint:1 with a bool	2016-08-15 22:16:09 +00:00
metamakefile.cpp	QRegExp include cleanup	2019-04-19 21:21:17 +00:00
metamakefile.h	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +00:00
projectgenerator.cpp	Prefix textstream operators with Qt::	2019-05-02 11:52:02 +00:00
projectgenerator.h	qmake: Apply modernize-use-override	2018-08-08 17:30:23 +00:00
xmloutput.cpp	Prefix textstream operators with Qt::	2019-05-02 11:52:02 +00:00
xmloutput.h	Updated license headers	2016-01-21 18:55:18 +00:00