summaryrefslogtreecommitdiff
path: root/src/plugins/genericprojectmanager
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2019-06-26 17:09:35 +0200
committerhjk <hjk@qt.io>2019-06-26 16:02:23 +0000
commite7c6169d70fac97cb0702cac8a4aadab6f90939b (patch)
tree29e73b4791c1e4bcce0b49f00b1561c21851499e /src/plugins/genericprojectmanager
parentf878486fcbf0c14d668c46247a0b45143628c0e0 (diff)
downloadqt-creator-e7c6169d70fac97cb0702cac8a4aadab6f90939b.tar.gz
ProjectExplorer etc: More FilePath usage
Mostly for project files. Change-Id: Icb6059f80758865e42cc9f9c092ec6782770dfd7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/genericprojectmanager')
-rw-r--r--src/plugins/genericprojectmanager/genericbuildconfiguration.cpp9
-rw-r--r--src/plugins/genericprojectmanager/genericbuildconfiguration.h2
2 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
index 4c94efab5b..0f367faf0c 100644
--- a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
+++ b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
@@ -92,16 +92,17 @@ QList<BuildInfo> GenericBuildConfigurationFactory::availableBuilds(const Target
return {createBuildInfo(parent->kit(), parent->project()->projectDirectory())};
}
-QList<BuildInfo> GenericBuildConfigurationFactory::availableSetups(const Kit *k, const QString &projectPath) const
+QList<BuildInfo>
+ GenericBuildConfigurationFactory::availableSetups(const Kit *k, const FilePath &projectPath) const
{
- BuildInfo info = createBuildInfo(k, Project::projectDirectory(Utils::FilePath::fromString(projectPath)));
+ BuildInfo info = createBuildInfo(k, Project::projectDirectory(projectPath));
//: The name of the build configuration created by default for a generic project.
info.displayName = tr("Default");
return {info};
}
-BuildInfo GenericBuildConfigurationFactory::createBuildInfo(const Kit *k,
- const Utils::FilePath &buildDir) const
+BuildInfo
+ GenericBuildConfigurationFactory::createBuildInfo(const Kit *k, const FilePath &buildDir) const
{
BuildInfo info(this);
info.typeName = tr("Build");
diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.h b/src/plugins/genericprojectmanager/genericbuildconfiguration.h
index fdd97c36cf..ae46cfcf34 100644
--- a/src/plugins/genericprojectmanager/genericbuildconfiguration.h
+++ b/src/plugins/genericprojectmanager/genericbuildconfiguration.h
@@ -55,7 +55,7 @@ public:
private:
QList<ProjectExplorer::BuildInfo> availableBuilds(const ProjectExplorer::Target *parent) const override;
QList<ProjectExplorer::BuildInfo> availableSetups(const ProjectExplorer::Kit *k,
- const QString &projectPath) const override;
+ const Utils::FilePath &projectPath) const override;
ProjectExplorer::BuildInfo createBuildInfo(const ProjectExplorer::Kit *k, const Utils::FilePath &buildDir) const;
};