QFileSystemEngine::canonicalName: skip QDir::cleanPath()
realpath() is supposed to return the canonicalized absolute path, so there should be nothing left to clean. Change-Id: Ie30a3caf09ef4176bb36fffd17cde30c7538dba9 Reviewed-by: Ahmad Samir <a.samirh78@gmail.com> (cherry picked from commit 31cf699e69808403b6533b08b3194af24cac2eab) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
894837577d
commit
8dd5bfa591
@ -677,8 +677,7 @@ QFileSystemEntry QFileSystemEngine::canonicalName(const QFileSystemEntry &entry,
|
||||
if (resolved_name) {
|
||||
data.knownFlagsMask |= QFileSystemMetaData::ExistsAttribute;
|
||||
data.entryFlags |= QFileSystemMetaData::ExistsAttribute;
|
||||
QString canonicalPath = QDir::cleanPath(QFile::decodeName(resolved_name));
|
||||
return QFileSystemEntry(canonicalPath);
|
||||
return QFileSystemEntry(resolved_name, QFileSystemEntry::FromNativePath{});
|
||||
} else if (errno == ENOENT || errno == ENOTDIR) { // file doesn't exist
|
||||
data.knownFlagsMask |= QFileSystemMetaData::ExistsAttribute;
|
||||
data.entryFlags &= ~(QFileSystemMetaData::ExistsAttribute);
|
||||
|
Loading…
x
Reference in New Issue
Block a user