diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-04 15:21:02 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-04 15:21:02 (GMT) |
| commit | 793d3c2da83098e32063c4ae6df187058103bde8 (patch) | |
| tree | 7b96581a67bd66ff30b0ede18b0fbfd71d9345cf /src/corelib/io/qfile.cpp | |
| parent | 2d0f49df3a3c44601bf2e41ea722c2384b71aab0 (diff) | |
| parent | c2d47f6717fdccd44838f3c128693a3c09f6cf68 (diff) | |
| download | Qt-793d3c2da83098e32063c4ae6df187058103bde8.zip Qt-793d3c2da83098e32063c4ae6df187058103bde8.tar.gz Qt-793d3c2da83098e32063c4ae6df187058103bde8.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-multitouch
Diffstat (limited to 'src/corelib/io/qfile.cpp')
| -rw-r--r-- | src/corelib/io/qfile.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp index d7da800..04750b0 100644 --- a/src/corelib/io/qfile.cpp +++ b/src/corelib/io/qfile.cpp @@ -708,6 +708,7 @@ QFile::rename(const QString &newName) d->setError(QFile::RenameError, tr("Destination file exists")); return false; } + unsetError(); close(); if(error() == QFile::NoError) { if (fileEngine()->rename(newName)) { @@ -849,6 +850,7 @@ QFile::copy(const QString &newName) d->setError(QFile::CopyError, tr("Destination file exists")); return false; } + unsetError(); close(); if(error() == QFile::NoError) { if(fileEngine()->copy(newName)) { @@ -908,6 +910,7 @@ QFile::copy(const QString &newName) out.setAutoRemove(false); #endif } + close(); } if(!error) { QFile::setPermissions(newName, permissions()); |