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

ProjectExplorer: Merge BuildConfigurationFactory::availableBuilds

Browse Source 
... and availableSetups as far as mechanically possible.

Change-Id: Ia1d7babe943eea25da97cef7838187c234378673
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-06-27 10:22:13 +02:00
parent f94e55b807
commit 5dbfd46bcf
17 changed files with 118 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
View File

@@ -85,31 +85,20 @@ GenericBuildConfigurationFactory::GenericBuildConfigurationFactory()
setSupportedProjectMimeTypeName(Constants::GENERICMIMETYPE);
}
GenericBuildConfigurationFactory::~GenericBuildConfigurationFactory() = default;
QList<BuildInfo>
GenericBuildConfigurationFactory::availableBuilds(const Kit *k, const FilePath &projectPath) const
{
return {createBuildInfo(k, projectPath)};
}
QList<BuildInfo>
GenericBuildConfigurationFactory::availableSetups(const Kit *k, const FilePath &projectPath) const
{
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 FilePath &buildDir) const
QList<BuildInfo> GenericBuildConfigurationFactory::availableBuilds
(const Kit *k, const FilePath &projectPath, bool forSetup) const
{
BuildInfo info(this);
info.typeName = tr("Build");
info.buildDirectory = buildDir;
info.buildDirectory = forSetup ? Project::projectDirectory(projectPath) : projectPath;
info.kitId = k->id();
return info;
if (forSetup) {
//: The name of the build configuration created by default for a generic project.
info.displayName = tr("Default");
}
return {info};
}
BuildConfiguration::BuildType GenericBuildConfiguration::buildType() const