diff options
| author | Kavindra Devi Palaraja <kavindra.palaraja@nokia.com> | 2009-04-30 11:35:53 (GMT) |
|---|---|---|
| committer | Kavindra Devi Palaraja <kavindra.palaraja@nokia.com> | 2009-04-30 11:35:53 (GMT) |
| commit | 3ab338c1b25b26d063a2e1ad1917f16945ea6a29 (patch) | |
| tree | c32b49aaeccd99c7c635ae52a4d2d5d43a7a0c42 /src | |
| parent | 7727a011266e54bd0d1b31416cae81c35e57e694 (diff) | |
| parent | 60e5266eec332792d23f13ea63203f45f8e0f430 (diff) | |
| download | Qt-3ab338c1b25b26d063a2e1ad1917f16945ea6a29.zip Qt-3ab338c1b25b26d063a2e1ad1917f16945ea6a29.tar.gz Qt-3ab338c1b25b26d063a2e1ad1917f16945ea6a29.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src')
| -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()); |