Liang Qi ef37ab9970 Merge remote-tracking branch 'origin/5.12' into dev ... Conflicts: .qmake.conf src/gui/painting/qdrawhelper.cpp src/gui/text/qdistancefield.cpp src/gui/text/qdistancefield_p.h src/network/ssl/qsslsocket_openssl.cpp src/plugins/platforms/android/qandroidinputcontext.cpp src/widgets/styles/qstylesheetstyle.cpp Done-With: Timur Pocheptsov <timur.pocheptsov@qt.io> Change-Id: Ia7daad21f077ea889898f17734ec46303e71fe6b		2019-06-25 13:04:27 +02:00
..
.gitattributes	Moved network autotests into new directory structure	2011-09-09 09:32:17 +02:00
.gitignore	Moved network autotests into new directory structure	2011-09-09 09:32:17 +02:00
BLACKLIST	qtbase: cleanup BLACKLIST files	2018-02-13 15:20:33 +00:00
qftp.pro	Migrate QFtp test to new test server	2019-05-15 06:09:41 +00:00
rfc3252.txt	Moved network autotests into new directory structure	2011-09-09 09:32:17 +02:00
tst_qftp.cpp	Merge remote-tracking branch 'origin/5.12' into dev	2019-06-25 13:04:27 +02:00