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
..
access	Merge remote-tracking branch 'origin/5.13' into dev	2019-06-27 14:38:03 +02:00
bearer	Add cmdline feature to qmake	2019-02-18 07:12:14 +00:00
kernel	Migrate Windows system libs to external dependencies	2019-05-08 08:30:02 +00:00
socket	Convert uses of QTime as a timer to QElapsedTimer	2019-06-14 10:42:33 +02:00
ssl	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-06-25 15:47:42 +02:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00