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
..
2019-04-19 21:21:17 +00:00
2016-01-21 18:55:18 +00:00
2019-04-19 21:21:17 +00:00
2019-04-19 21:21:17 +00:00
2018-11-29 07:46:02 +00:00