diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-02 19:40:01 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-02 19:40:01 (GMT) |
| commit | 78df9e39a43b21f7f0fedca11f906a2ae9df99c1 (patch) | |
| tree | 7555c67167c8ae23243056066ac39b3a9a0f42d7 /doc/src/examples/ftp.qdoc | |
| parent | 5d22c768c4066ebec59193bc3ab3af18cc461534 (diff) | |
| parent | 6d5963486c8c2a154caf3a2a391bce19cbbeb881 (diff) | |
| download | Qt-78df9e39a43b21f7f0fedca11f906a2ae9df99c1.zip Qt-78df9e39a43b21f7f0fedca11f906a2ae9df99c1.tar.gz Qt-78df9e39a43b21f7f0fedca11f906a2ae9df99c1.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Fixing potential js hole in the js function for the feedback channel.
qdoc: Completed task QTBUG-18790
qdoc: Completed task QTBUG-18733
qdoc: Last commit before merge into master.
Doc: Fixed reference to a name in a table.
qdoc: Fixed license comment.
Ensured that incomplete downloads are removed.
qdoc: Added missing copyright notice
qdoc: Updated the QDoc manual.
qdoc: Updated the QDoc manual.
qdoc: Updated the QDoc manual.
qdoc: Updated the QDoc manual.
qdoc: Fixed QTBUG-18591
Aim to fix Windows builds.
Diffstat (limited to 'doc/src/examples/ftp.qdoc')
| -rw-r--r-- | doc/src/examples/ftp.qdoc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/src/examples/ftp.qdoc b/doc/src/examples/ftp.qdoc index 4fa2cfd..841d298 100644 --- a/doc/src/examples/ftp.qdoc +++ b/doc/src/examples/ftp.qdoc @@ -131,7 +131,9 @@ \snippet examples/network/qftp/ftpwindow.cpp 5 - QFtp supports canceling the download of files. + QFtp supports canceling the download of files. We make sure that + any file that is currently being written to is closed and removed, + and tidy up by deleting the file object. \snippet examples/network/qftp/ftpwindow.cpp 6 |