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

22
src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
View File

@@ -59,6 +59,7 @@
#endif
using namespace ProjectExplorer;
using namespace Utils;
namespace CompilationDatabaseProjectManager {
namespace Internal {
@@ -529,26 +530,15 @@ CompilationDatabaseBuildConfigurationFactory::CompilationDatabaseBuildConfigurat
setSupportedProjectMimeTypeName(Constants::COMPILATIONDATABASEMIMETYPE);
}
static QList<ProjectExplorer::BuildInfo> defaultBuildInfos(
const ProjectExplorer::BuildConfigurationFactory *factory, const QString &name)
QList<BuildInfo> CompilationDatabaseBuildConfigurationFactory::availableBuilds
(const Kit *, const FilePath &, bool) const
{
ProjectExplorer::BuildInfo info(factory);
const QString name = tr("Release");
ProjectExplorer::BuildInfo info(this);
info.typeName = name;
info.displayName = name;
info.buildType = BuildConfiguration::Release;
QList<ProjectExplorer::BuildInfo> buildInfos;
buildInfos << info;
return buildInfos;
}
QList<BuildInfo> CompilationDatabaseBuildConfigurationFactory::availableBuilds(const Kit *, const Utils::FilePath &) const
{
return defaultBuildInfos(this, tr("Release"));
}
QList<BuildInfo> CompilationDatabaseBuildConfigurationFactory::availableSetups(const Kit *, const Utils::FilePath &) const
{
return defaultBuildInfos(this, tr("Release"));
return {info};
}
} // namespace Internal

7
src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.h
View File

@@ -104,10 +104,9 @@ class CompilationDatabaseBuildConfigurationFactory
public:
CompilationDatabaseBuildConfigurationFactory();
QList<ProjectExplorer::BuildInfo> availableBuilds(
const ProjectExplorer::Kit *k, const Utils::FilePath &projectPath) const override;
QList<ProjectExplorer::BuildInfo> availableSetups(
const ProjectExplorer::Kit *k, const Utils::FilePath &projectPath) const override;
QList<ProjectExplorer::BuildInfo> availableBuilds(const ProjectExplorer::Kit *k,
const Utils::FilePath &projectPath,
bool forSetup) const override;
};
} // namespace Internal