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
..
mingw_make.cpp	Merge remote-tracking branch 'origin/5.13' into dev	2019-06-27 14:38:03 +02:00
mingw_make.h	Clean up class definitions of makefile generators	2019-05-16 11:36:22 +00:00
msbuild_objectmodel.cpp	Merge remote-tracking branch 'origin/5.13' into dev	2019-04-24 09:52:30 +02:00
msbuild_objectmodel.h	qmake: Apply modernize-use-override	2018-08-08 17:30:23 +00:00
msvc_nmake.cpp	Clean up class definitions of makefile generators	2019-05-16 11:36:22 +00:00
msvc_nmake.h	Clean up class definitions of makefile generators	2019-05-16 11:36:22 +00:00
msvc_objectmodel.cpp	Merge remote-tracking branch 'origin/5.13' into dev	2019-06-14 13:45:18 +02:00
msvc_objectmodel.h	Prefix textstream operators with Qt::	2019-05-02 11:52:02 +00:00
msvc_vcproj.cpp	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-06-07 13:19:27 +02:00
msvc_vcproj.h	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-06-07 13:19:27 +02:00
msvc_vcxproj.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
msvc_vcxproj.h	qmake: Apply modernize-use-override	2018-08-08 17:30:23 +00:00
winmakefile.cpp	Merge remote-tracking branch 'origin/5.13' into dev	2019-06-14 13:45:18 +02:00
winmakefile.h	Deduplicate initialization code for default variables	2019-05-16 11:36:36 +00:00