diff options
| author | Sami Merilä <sami.merila@nokia.com> | 2009-04-30 07:16:39 (GMT) |
|---|---|---|
| committer | Sami Merilä <sami.merila@nokia.com> | 2009-04-30 07:16:39 (GMT) |
| commit | 8204909ee296117aa2faeb9569fb0f948bb096ce (patch) | |
| tree | 8dda8d2d089b77eac66f9e3420fd3e9562beeea7 /src | |
| parent | 5866a3ad648a0b8f2edda5b49c86fbdd6e4383b0 (diff) | |
| parent | feea3a74f77aace876716e114fdb91a3557b9478 (diff) | |
| download | Qt-8204909ee296117aa2faeb9569fb0f948bb096ce.zip Qt-8204909ee296117aa2faeb9569fb0f948bb096ce.tar.gz Qt-8204909ee296117aa2faeb9569fb0f948bb096ce.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/io/qfile.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp index 01a236c..4a20c97 100644 --- a/src/corelib/io/qfile.cpp +++ b/src/corelib/io/qfile.cpp @@ -743,10 +743,12 @@ QFile::rename(const QString &newName) error = true; } } - if (error) + if (error) { out.remove(); - else + } else { + fileEngine()->setFileName(newName); setFileName(newName); + } return !error; } } |