aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/compilationdatabaseprojectmanager
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2019-08-02 18:06:29 +0200
committerhjk <hjk@qt.io>2019-08-22 11:05:04 +0000
commitfb631cb2585ae0acafa7a7df0f295c236f7b36f8 (patch)
treeee33f85a5bf0b802a6c70e6188b33a14dfdecff4 /src/plugins/compilationdatabaseprojectmanager
parent02707ecdad63f8997a03294ae29d9adc38d054f3 (diff)
ProjectExplorer: Set up hack to funnel information to buildstep ctors
For now, store most of BuildInfo in the BuildConfiguration. This will allow accessing it in the BuildStep ctors so the BuildSteps can be fully setup without polishing afterwards (as currently done in the main build steps of the three buildsystems, and Nim) This in meant to be temporary to a large degree. Change-Id: If6ade6052f4b96670995399ae97ef7d2313f632a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/compilationdatabaseprojectmanager')
-rw-r--r--src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp9
-rw-r--r--src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.h3
2 files changed, 3 insertions, 9 deletions
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
index 63b301af85..17cd53817d 100644
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
@@ -502,9 +502,9 @@ CompilationDatabaseBuildConfiguration::CompilationDatabaseBuildConfiguration(
target->setApplicationTargets({BuildTargetInfo()});
}
-void CompilationDatabaseBuildConfiguration::initialize(const ProjectExplorer::BuildInfo &info)
+void CompilationDatabaseBuildConfiguration::initialize()
{
- ProjectExplorer::BuildConfiguration::initialize(info);
+ ProjectExplorer::BuildConfiguration::initialize();
BuildStepList *buildSteps = stepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
buildSteps->appendStep(ProjectExplorer::Constants::PROCESS_STEP_ID);
}
@@ -514,11 +514,6 @@ ProjectExplorer::NamedWidget *CompilationDatabaseBuildConfiguration::createConfi
return new ProjectExplorer::NamedWidget();
}
-ProjectExplorer::BuildConfiguration::BuildType CompilationDatabaseBuildConfiguration::buildType() const
-{
- return ProjectExplorer::BuildConfiguration::Release;
-}
-
CompilationDatabaseBuildConfigurationFactory::CompilationDatabaseBuildConfigurationFactory()
{
registerBuildConfiguration<CompilationDatabaseBuildConfiguration>(
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.h b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.h
index 9e38e91431..ca829f312a 100644
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.h
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.h
@@ -88,10 +88,9 @@ class CompilationDatabaseBuildConfiguration : public ProjectExplorer::BuildConfi
public:
CompilationDatabaseBuildConfiguration(ProjectExplorer::Target *target, Core::Id id);
ProjectExplorer::NamedWidget *createConfigWidget() override;
- BuildType buildType() const override;
protected:
- void initialize(const ProjectExplorer::BuildInfo &info) override;
+ void initialize() override;
};
class CompilationDatabaseBuildConfigurationFactory