Liang Qi c7934f2489 Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: src/corelib/io/qprocess.cpp src/corelib/io/qprocess_unix.cpp src/network/kernel/qnetworkinterface_winrt.cpp tools/configure/configureapp.cpp Change-Id: I47df00a01597d2e63b334b492b3b4221b29f58ea		2015-11-18 09:01:51 +01:00
..
.gitattributes	…
.gitignore	…
BLACKLIST	tests: blacklist the data row which uses internet in tst_qftp.cpp	2015-11-17 14:47:33 +00:00
qftp.pro	Blacklist some cases from tst_qftp	2015-08-03 06:54:21 +00:00
rfc3252.txt	…
tst_qftp.cpp	tests/auto/network: Remove some placeholder formatting.	2015-10-19 12:38:28 +00:00