summaryrefslogtreecommitdiffstats
path: root/src/network/access/qnetworkaccessftpbackend.cpp
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-02-01 13:02:36 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2011-02-01 13:02:36 (GMT)
commit0533cd3a773952490eb0e5686afb7b235799a13f (patch)
treea1f14fe42a51499666921d58a6a5b62f1f916d8e /src/network/access/qnetworkaccessftpbackend.cpp
parent9c132451acc7fbed1611fd3676cceb26e815f50d (diff)
parente5974b024828578945bd4c349f5f87f82a635225 (diff)
downloadQt-0533cd3a773952490eb0e5686afb7b235799a13f.zip
Qt-0533cd3a773952490eb0e5686afb7b235799a13f.tar.gz
Qt-0533cd3a773952490eb0e5686afb7b235799a13f.tar.bz2
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts: mkspecs/features/symbian/application_icon.prf src/sql/drivers/odbc/qsql_odbc.cpp
Diffstat (limited to 'src/network/access/qnetworkaccessftpbackend.cpp')
-rw-r--r--src/network/access/qnetworkaccessftpbackend.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/network/access/qnetworkaccessftpbackend.cpp b/src/network/access/qnetworkaccessftpbackend.cpp
index bad010f..e34e6bb 100644
--- a/src/network/access/qnetworkaccessftpbackend.cpp
+++ b/src/network/access/qnetworkaccessftpbackend.cpp
@@ -307,8 +307,10 @@ void QNetworkAccessFtpBackend::ftpDone()
// logged in successfully, send the stat requests (if supported)
QString command = url().path();
command.prepend(QLatin1String("%1 "));
- if (supportsSize)
+ if (supportsSize) {
+ ftp->rawCommand(QLatin1String("TYPE I"));
sizeId = ftp->rawCommand(command.arg(QLatin1String("SIZE"))); // get size
+ }
if (supportsMdtm)
mdtmId = ftp->rawCommand(command.arg(QLatin1String("MDTM"))); // get modified time
if (!supportsSize && !supportsMdtm)