From 9e0ed9eeac9adf3948d7640074f2cce504149cad Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 25 Nov 2022 14:12:34 +0100 Subject: [PATCH] QMake: Remove one occurrence of QDir::cleanPath Depends on host system. Task-number: QTCREATORBUG-28355 Change-Id: I2f44bbbb96a080154838d9677e3c8aee2dba5e18 Reviewed-by: Christian Stenger --- src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp index 8467b62bd6b..3d300399fa6 100644 --- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp @@ -2035,8 +2035,8 @@ FilePath QmakeProFile::sourceDir() const } FilePaths QmakeProFile::generatedFiles(const FilePath &buildDir, - const FilePath &sourceFile, - const FileType &sourceFileType) const + const FilePath &sourceFile, + const FileType &sourceFileType) const { // The mechanism for finding the file names is rather crude, but as we // cannot parse QMAKE_EXTRA_COMPILERS and qmake has facilities to put @@ -2055,7 +2055,7 @@ FilePaths QmakeProFile::generatedFiles(const FilePath &buildDir, location = location.pathAppended("ui_" + sourceFile.completeBaseName() + singleVariableValue(Variable::HeaderExtension)); - return { FilePath::fromString(QDir::cleanPath(location.toString())) }; + return {location.cleanPath()}; } else if (sourceFileType == FileType::StateChart) { if (buildDir.isEmpty()) return { }; @@ -2065,7 +2065,7 @@ FilePaths QmakeProFile::generatedFiles(const FilePath &buildDir, location.stringAppended(singleVariableValue(Variable::CppExtension)) }; } - return { }; + return {}; } QList QmakeProFile::extraCompilers() const