diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-05-06 16:36:37 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-05-07 14:27:09 +0200 |
| commit | a033c23ddffed6b9bff3e7be68d513a7962c3b5e (patch) | |
| tree | 99b6d15bca0711c8030c4abb62b26d0e6ba577a5 /src | |
| parent | ef0287d589cd1a73655fa89b274145e318839299 (diff) | |
QFile::moveToTrash: work with relative file paths on Windows
The system APIs expect an absolute "display name" of the file path,
so make it absolute.
The test was overly tolerant in accepting failure, as a QStorageInfo
initialized with a file path that doesn't exist is invalid, and thus
always different from the QStorageInfo of the home directory. Fix the
test to compare only valid QStorageInfo objects, and postpone the check
until the file we want to move has been created.
[ChangeLog][QtCore][QFile] moveToTrash supports relative file paths
on Windows
Change-Id: I94c8cd40c60fde469e38f76a98f867f20c6a0b15
Fixes: QTBUG-84015
Pick-to: 5.15
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/io/qfilesystemengine_win.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp index 75ad5d3cc5..a4f47cbf24 100644 --- a/src/corelib/io/qfilesystemengine_win.cpp +++ b/src/corelib/io/qfilesystemengine_win.cpp @@ -1548,8 +1548,8 @@ bool QFileSystemEngine::moveFileToTrash(const QFileSystemEntry &source, QFileSystemEntry &newLocation, QSystemError &error) { #ifndef Q_OS_WINRT - // we need the "display name" of the file, so can't use nativeFilePath - const QString sourcePath = QDir::toNativeSeparators(source.filePath()); + // we need the "display name" of the file, so can't use nativeAbsoluteFilePath + const QString sourcePath = QDir::toNativeSeparators(absoluteName(source).filePath()); /* Windows 7 insists on showing confirmation dialogs and ignores the respective |