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

Utils: add FilePath::completeBaseName

Browse Source 
Removing some FilePath::toFileInfo() calls again.

Change-Id: I6610beebf2c30754fde525b71f4c4a34ceb5e30b
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
David Schulz
2021-06-04 07:59:00 +02:00
parent 5544fd35c4
commit 5ec611b68e
24 changed files with 48 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -165,7 +165,7 @@ FilePath QmakePriFile::directoryPath() const
QString QmakePriFile::displayName() const
{
return filePath().toFileInfo().completeBaseName();
return filePath().completeBaseName();
}
QmakePriFile *QmakePriFile::parent() const
@@ -2068,13 +2068,13 @@ FilePaths QmakeProFile::generatedFiles(const FilePath &buildDir,
if (location.isEmpty())
return { };
location = location.pathAppended("ui_"
+ sourceFile.toFileInfo().completeBaseName()
+ sourceFile.completeBaseName()
+ singleVariableValue(Variable::HeaderExtension));
return { Utils::FilePath::fromString(QDir::cleanPath(location.toString())) };
} else if (sourceFileType == FileType::StateChart) {
if (buildDir.isEmpty())
return { };
const FilePath location = buildDir.pathAppended(sourceFile.toFileInfo().completeBaseName());
const FilePath location = buildDir.pathAppended(sourceFile.completeBaseName());
return {
location.stringAppended(singleVariableValue(Variable::HeaderExtension)),
location.stringAppended(singleVariableValue(Variable::CppExtension))