diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-03 09:06:47 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-03 09:06:47 (GMT) |
| commit | 660ebda77f6cbc4a41f45f78e18dbc892cd1c551 (patch) | |
| tree | 36ecf9860281d337bfda350c597951623838ca9f /examples | |
| parent | 43482fcfc106864f104f463002575c389d40b12f (diff) | |
| parent | 78df9e39a43b21f7f0fedca11f906a2ae9df99c1 (diff) | |
| download | Qt-660ebda77f6cbc4a41f45f78e18dbc892cd1c551.zip Qt-660ebda77f6cbc4a41f45f78e18dbc892cd1c551.tar.gz Qt-660ebda77f6cbc4a41f45f78e18dbc892cd1c551.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/gui/graphicsview/qgraphicslayout.cpp
src/gui/graphicsview/qgraphicslayout_p.cpp
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/network/qftp/ftpwindow.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/examples/network/qftp/ftpwindow.cpp b/examples/network/qftp/ftpwindow.cpp index c3e629f..159cad6 100644 --- a/examples/network/qftp/ftpwindow.cpp +++ b/examples/network/qftp/ftpwindow.cpp @@ -243,6 +243,12 @@ void FtpWindow::downloadFile() void FtpWindow::cancelDownload() { ftp->abort(); + + if (file->exists()) { + file->close(); + file->remove(); + } + delete file; } //![5] |