Liang Qi 25eb97d2d4 Merge remote-tracking branch 'origin/5.13' into dev ... Conflicts: .qmake.conf src/network/ssl/qsslsocket_openssl.cpp Done-With: Timur Pocheptsov <timur.pocheptsov@qt.io> Change-Id: Ibb57a0548b4977797b400637487a56245ac1c024		2019-06-27 14:38:03 +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-06-14 13:45:18 +02:00
win32	Merge remote-tracking branch 'origin/5.13' into dev	2019-06-27 14:38:03 +02:00
makefile.cpp	Merge remote-tracking branch 'origin/5.13' into dev	2019-06-14 13:45:18 +02:00
makefile.h	De-duplicate code for calling extra compiler depend_command	2019-05-29 11:06:10 +02:00
makefiledeps.cpp	qmake: Cleanup	2019-06-05 10:59:43 +02: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	Clean up class definitions of makefile generators	2019-05-16 11:36:22 +00:00
projectgenerator.h	Merge remote-tracking branch 'origin/5.13' into dev	2019-06-14 13:45:18 +02: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