diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-07-28 10:58:46 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-07-28 11:45:59 (GMT) |
| commit | 7eba68adc4a7862d9474179592e5c8393a7acdbb (patch) | |
| tree | 73014cabc8b10f46203844aeb40de574d97032dc /src/network/access | |
| parent | a20f8dcbeafa34b50ef69d1c5db0f17b09731d2a (diff) | |
| parent | 3bf3981c7026de9017887d08312391b54fe8afc6 (diff) | |
| download | Qt-7eba68adc4a7862d9474179592e5c8393a7acdbb.zip Qt-7eba68adc4a7862d9474179592e5c8393a7acdbb.tar.gz Qt-7eba68adc4a7862d9474179592e5c8393a7acdbb.tar.bz2 | |
Merge commit 'qt/master-stable'
Conflicts:
configure.exe
src/corelib/io/io.pri
src/corelib/io/qfilesystemwatcher.cpp
tests/auto/qfileinfo/tst_qfileinfo.cpp
tools/configure/configureapp.cpp
Diffstat (limited to 'src/network/access')
| -rw-r--r-- | src/network/access/qftp.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/access/qftp.cpp b/src/network/access/qftp.cpp index acf1a27..8e72323 100644 --- a/src/network/access/qftp.cpp +++ b/src/network/access/qftp.cpp @@ -1390,7 +1390,7 @@ int QFtpPrivate::addCommand(QFtpCommand *cmd) \warning The current version of QFtp doesn't fully support non-Unix FTP servers. - \sa QHttp, QNetworkAccessManager, QNetworkRequest, QNetworkReply, + \sa QNetworkAccessManager, QNetworkRequest, QNetworkReply, {FTP Example} */ @@ -1737,8 +1737,8 @@ int QFtp::setTransferMode(TransferMode mode) Enables use of the FTP proxy on host \a host and port \a port. Calling this function with \a host empty disables proxying. - QFtp does not support FTP-over-HTTP proxy servers. Use QHttp for - this. + QFtp does not support FTP-over-HTTP proxy servers. Use + QNetworkAccessManager for this. */ int QFtp::setProxy(const QString &host, quint16 port) { |