Liang Qi f34e73a16a Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: src/corelib/kernel/qobject.cpp src/gui/painting/qpaintengine_raster.cpp Change-Id: I74e1779832f43d033708dcfd6b666c7b4f0111fb		2016-04-11 09:12:36 +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	tests: blacklist the data row which uses internet in tst_qftp.cpp	2015-11-17 14:47:33 +00:00
qftp.pro	QtNetwork: Remove Windows CE.	2016-03-29 20:28:18 +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.7' into dev	2016-04-11 09:12:36 +02:00