aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/cmakeprojectmanager
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/cmakeprojectmanager')
-rw-r--r--src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp3
-rw-r--r--src/plugins/cmakeprojectmanager/fileapidataextractor.cpp6
-rw-r--r--src/plugins/cmakeprojectmanager/fileapiparser.cpp4
3 files changed, 6 insertions, 7 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
index 8a05bd2bfbc..823f091e6ca 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
@@ -306,8 +306,7 @@ FilePaths CMakeBuildSystem::filesGeneratedFrom(const FilePath &sourceFile) const
if (sourceFile.suffix() == "ui") {
generatedFilePath = generatedFilePath
- .pathAppended("ui_" + sourceFile.completeBaseName() + ".h")
- .cleanPath();
+ .pathAppended("ui_" + sourceFile.completeBaseName() + ".h");
return {generatedFilePath};
}
if (sourceFile.suffix() == "scxml") {
diff --git a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
index da791d51642..be182ec43a4 100644
--- a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
+++ b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
@@ -464,7 +464,7 @@ FilePath directorySourceDir(const Configuration &c, const FilePath &sourceDir, i
const size_t di = static_cast<size_t>(directoryIndex);
QTC_ASSERT(di < c.directories.size(), return FilePath());
- return sourceDir.resolvePath(c.directories[di].sourcePath).cleanPath();
+ return sourceDir.resolvePath(c.directories[di].sourcePath);
}
FilePath directoryBuildDir(const Configuration &c, const FilePath &buildDir, int directoryIndex)
@@ -472,7 +472,7 @@ FilePath directoryBuildDir(const Configuration &c, const FilePath &buildDir, int
const size_t di = static_cast<size_t>(directoryIndex);
QTC_ASSERT(di < c.directories.size(), return FilePath());
- return buildDir.resolvePath(c.directories[di].buildPath).cleanPath();
+ return buildDir.resolvePath(c.directories[di].buildPath);
}
void addProjects(const QHash<Utils::FilePath, ProjectNode *> &cmakeListsNodes,
@@ -542,7 +542,7 @@ void addCompileGroups(ProjectNode *targetRoot,
std::vector<std::vector<std::unique_ptr<FileNode>>> sourceGroupFileNodes{td.sourceGroups.size()};
for (const SourceInfo &si : td.sources) {
- const FilePath sourcePath = topSourceDirectory.resolvePath(si.path).cleanPath();
+ const FilePath sourcePath = topSourceDirectory.resolvePath(si.path);
// Filter out already known files:
const int count = alreadyListed.count();
diff --git a/src/plugins/cmakeprojectmanager/fileapiparser.cpp b/src/plugins/cmakeprojectmanager/fileapiparser.cpp
index 0d6eefe6346..4bd91cfbe28 100644
--- a/src/plugins/cmakeprojectmanager/fileapiparser.cpp
+++ b/src/plugins/cmakeprojectmanager/fileapiparser.cpp
@@ -919,9 +919,9 @@ FilePath FileApiParser::scanForCMakeReplyFile(const FilePath &buildDirectory)
FilePaths FileApiParser::cmakeQueryFilePaths(const FilePath &buildDirectory)
{
- FilePath queryDir = buildDirectory / CMAKE_RELATIVE_QUERY_PATH;
+ const FilePath queryDir = buildDirectory / CMAKE_RELATIVE_QUERY_PATH;
return transform(CMAKE_QUERY_FILENAMES, [&queryDir](const QString &name) {
- return queryDir.resolvePath(FilePath::fromString(name));
+ return queryDir.resolvePath(name);
});
}