diff options
| author | hjk <hjk@qt.io> | 2019-08-02 18:06:29 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-08-22 11:05:04 +0000 |
| commit | fb631cb2585ae0acafa7a7df0f295c236f7b36f8 (patch) | |
| tree | ee33f85a5bf0b802a6c70e6188b33a14dfdecff4 /src/plugins/genericprojectmanager | |
| parent | 02707ecdad63f8997a03294ae29d9adc38d054f3 (diff) | |
| download | qt-creator-fb631cb2585ae0acafa7a7df0f295c236f7b36f8.tar.gz | |
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/genericprojectmanager')
| -rw-r--r-- | src/plugins/genericprojectmanager/genericbuildconfiguration.cpp | 9 | ||||
| -rw-r--r-- | src/plugins/genericprojectmanager/genericbuildconfiguration.h | 3 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp index 84f14798d2..12d61b1611 100644 --- a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp +++ b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp @@ -58,9 +58,9 @@ GenericBuildConfiguration::GenericBuildConfiguration(Target *parent, Core::Id id updateCacheAndEmitEnvironmentChanged(); } -void GenericBuildConfiguration::initialize(const BuildInfo &info) +void GenericBuildConfiguration::initialize() { - BuildConfiguration::initialize(info); + BuildConfiguration::initialize(); BuildStepList *buildSteps = stepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD); buildSteps->appendStep(Constants::GENERIC_MS_ID); @@ -101,11 +101,6 @@ QList<BuildInfo> GenericBuildConfigurationFactory::availableBuilds return {info}; } -BuildConfiguration::BuildType GenericBuildConfiguration::buildType() const -{ - return Unknown; -} - void GenericBuildConfiguration::addToEnvironment(Utils::Environment &env) const { prependCompilerPathToEnvironment(target()->kit(), env); diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.h b/src/plugins/genericprojectmanager/genericbuildconfiguration.h index be04937315..03e590ab92 100644 --- a/src/plugins/genericprojectmanager/genericbuildconfiguration.h +++ b/src/plugins/genericprojectmanager/genericbuildconfiguration.h @@ -39,8 +39,7 @@ class GenericBuildConfiguration : public ProjectExplorer::BuildConfiguration friend class ProjectExplorer::BuildConfigurationFactory; GenericBuildConfiguration(ProjectExplorer::Target *parent, Core::Id id); - void initialize(const ProjectExplorer::BuildInfo &info) override; - BuildType buildType() const override; + void initialize() override; void addToEnvironment(Utils::Environment &env) const final; }; |