Liang Qi f4d8cafc1b Merge remote-tracking branch 'origin/5.10' into dev ... Conflicts: src/3rdparty/harfbuzz-ng/src/hb-private.hh src/sql/doc/snippets/code/doc_src_sql-driver.cpp src/sql/doc/src/sql-driver.qdoc Change-Id: I38f0e82fcd37926cbf3c1915e009a731040d4598		2018-01-11 18:10:41 +01: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	tests: blacklist the data row which uses internet in tst_qftp.cpp	2015-11-17 14:47:33 +00:00
qftp.pro	Use qtConfig throughout in qtbase	2016-08-19 04:28:05 +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.10' into dev	2018-01-11 18:10:41 +01:00