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/projectexplorer/buildconfiguration.cpp | |
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/projectexplorer/buildconfiguration.cpp')
-rw-r--r-- | src/plugins/projectexplorer/buildconfiguration.cpp | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp index 1a6ab7a025..d35aa5dbc3 100644 --- a/src/plugins/projectexplorer/buildconfiguration.cpp +++ b/src/plugins/projectexplorer/buildconfiguration.cpp @@ -169,12 +169,8 @@ NamedWidget *BuildConfiguration::createConfigWidget() return named; } -void BuildConfiguration::initialize(const BuildInfo &info) +void BuildConfiguration::initialize() { - setDisplayName(info.displayName); - setDefaultDisplayName(info.displayName); - setBuildDirectory(info.buildDirectory); - m_stepLists.append(new BuildStepList(this, Constants::BUILDSTEPS_BUILD)); m_stepLists.append(new BuildStepList(this, Constants::BUILDSTEPS_CLEAN)); } @@ -258,6 +254,11 @@ void BuildConfiguration::emitBuildDirectoryChanged() } } +QString BuildConfiguration::initialDisplayName() const +{ + return m_initialDisplayName; +} + ProjectExplorer::BaseStringAspect *BuildConfiguration::buildDirectoryAspect() const { return m_buildDirectoryAspect; @@ -505,7 +506,18 @@ BuildConfiguration *BuildConfigurationFactory::create(Target *parent, const Buil BuildConfiguration *bc = m_creator(parent); if (!bc) return nullptr; - bc->initialize(info); + + bc->setDisplayName(info.displayName); + bc->setDefaultDisplayName(info.displayName); + bc->setBuildDirectory(info.buildDirectory); + + bc->m_initialBuildType = info.buildType; + bc->m_initialDisplayName = info.displayName; + bc->m_initialBuildDirectory = info.buildDirectory; + bc->m_extraInfo = info.extraInfo; + + bc->initialize(); + return bc; } |