diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2015-03-02 09:23:07 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2015-03-02 09:23:07 +0100 |
| commit | 2b5982aac8ad103443e33379fe5654f5bd419c87 (patch) | |
| tree | 8cc1d4e00029a6c0f5a23d87e9c97cdfc4619538 /src/corelib/io | |
| parent | efe3f631f232e6cc3966de59b9237653bf7fa96e (diff) | |
| parent | fc3733cba4652f2b8930c66665103fcb20874735 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: I95b3a87c5068c6b8068b30a35655b4c2419e7f9e
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qfsfileengine_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp index a1a00016fd..5b18a85dd4 100644 --- a/src/corelib/io/qfsfileengine_win.cpp +++ b/src/corelib/io/qfsfileengine_win.cpp @@ -544,7 +544,7 @@ bool QFSFileEngine::renameOverwrite(const QString &newName) bool ret = ::DeleteAndRenameFile((wchar_t*)QFileSystemEntry(newName).nativeFilePath().utf16(), (wchar_t*)d->fileEntry.nativeFilePath().utf16()) != 0; if (!ret) { - ret = ::DeleteFile((wchar_t*)d->fileEntry.nativeFilePath().utf16()) != 0; + ret = ::DeleteFile((wchar_t*)QFileSystemEntry(newName).nativeFilePath().utf16()) != 0; if (ret) ret = ::MoveFile((wchar_t*)d->fileEntry.nativeFilePath().utf16(), (wchar_t*)QFileSystemEntry(newName).nativeFilePath().utf16()) != 0; |