feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QMake: Remove one occurrence of QDir::cleanPath

Browse Source 
Depends on host system.

Task-number: QTCREATORBUG-28355
Change-Id: I2f44bbbb96a080154838d9677e3c8aee2dba5e18
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2022-11-25 14:12:34 +01:00
parent 12b639970f
commit 9e0ed9eeac
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
View File

@@ -2035,8 +2035,8 @@ FilePath QmakeProFile::sourceDir() const
} }
FilePaths QmakeProFile::generatedFiles(const FilePath &buildDir, FilePaths QmakeProFile::generatedFiles(const FilePath &buildDir,
const FilePath &sourceFile, const FilePath &sourceFile,
const FileType &sourceFileType) const const FileType &sourceFileType) const
{ {
// The mechanism for finding the file names is rather crude, but as we // The mechanism for finding the file names is rather crude, but as we
// cannot parse QMAKE_EXTRA_COMPILERS and qmake has facilities to put // 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_" location = location.pathAppended("ui_"
+ sourceFile.completeBaseName() + sourceFile.completeBaseName()
+ singleVariableValue(Variable::HeaderExtension)); + singleVariableValue(Variable::HeaderExtension));
return { FilePath::fromString(QDir::cleanPath(location.toString())) }; return {location.cleanPath()};
} else if (sourceFileType == FileType::StateChart) { } else if (sourceFileType == FileType::StateChart) {
if (buildDir.isEmpty()) if (buildDir.isEmpty())
return { }; return { };
@@ -2065,7 +2065,7 @@ FilePaths QmakeProFile::generatedFiles(const FilePath &buildDir,
location.stringAppended(singleVariableValue(Variable::CppExtension)) location.stringAppended(singleVariableValue(Variable::CppExtension))
}; };
} }
return { }; return {};
} }
QList<ExtraCompiler *> QmakeProFile::extraCompilers() const QList<ExtraCompiler *> QmakeProFile::extraCompilers() const