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

BuildConfiugration: Rename subConfigWidgets to createSubConfigWidgets

Browse Source 
Indicating that new widgets are indeed created.

Change-Id: Iccc5e1e99f536fdfb0718f252a23f498053ad3a3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Daniel Teske
2012-11-08 16:15:45 +01:00
parent 613f3345e1
commit 241f36f89d
4 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
View File

@@ -70,12 +70,6 @@ BuildConfigWidget *AutotoolsBuildConfiguration::createConfigWidget()
return new AutotoolsBuildSettingsWidget; return new AutotoolsBuildSettingsWidget;
} }
QList<BuildConfigWidget *> AutotoolsBuildConfiguration::subConfigWidgets()
{
return QList<BuildConfigWidget *>() << new ProjectExplorer::BuildEnvironmentWidget;
}
AutotoolsBuildConfiguration::AutotoolsBuildConfiguration(ProjectExplorer::Target *parent, const Core::Id id) AutotoolsBuildConfiguration::AutotoolsBuildConfiguration(ProjectExplorer::Target *parent, const Core::Id id)
: BuildConfiguration(parent, id) : BuildConfiguration(parent, id)
{ {

2
src/plugins/projectexplorer/buildconfiguration.cpp
View File

@@ -117,7 +117,7 @@ BuildConfiguration::~BuildConfiguration()
delete m_macroExpander; delete m_macroExpander;
} }
QList<BuildConfigWidget*> BuildConfiguration::subConfigWidgets() QList<BuildConfigWidget*> BuildConfiguration::createSubConfigWidgets()
{ {
return QList<BuildConfigWidget *>() << new ProjectExplorer::BuildEnvironmentWidget; return QList<BuildConfigWidget *>() << new ProjectExplorer::BuildEnvironmentWidget;
} }

2
src/plugins/projectexplorer/buildconfiguration.h
View File

@@ -61,7 +61,7 @@ public:
virtual QString buildDirectory() const = 0; virtual QString buildDirectory() const = 0;
virtual BuildConfigWidget *createConfigWidget() = 0; virtual BuildConfigWidget *createConfigWidget() = 0;
virtual QList<BuildConfigWidget*> subConfigWidgets(); virtual QList<BuildConfigWidget*> createSubConfigWidgets();
// Maybe the BuildConfiguration is not the best place for the environment // Maybe the BuildConfiguration is not the best place for the environment
Utils::Environment baseEnvironment() const; Utils::Environment baseEnvironment() const;

2
src/plugins/projectexplorer/buildsettingspropertiespage.cpp
View File

@@ -242,7 +242,7 @@ void BuildSettingsWidget::updateBuildSettings()
addSubWidget(new BuildStepsPage(m_target, Core::Id(Constants::BUILDSTEPS_BUILD))); addSubWidget(new BuildStepsPage(m_target, Core::Id(Constants::BUILDSTEPS_BUILD)));
addSubWidget(new BuildStepsPage(m_target, Core::Id(Constants::BUILDSTEPS_CLEAN))); addSubWidget(new BuildStepsPage(m_target, Core::Id(Constants::BUILDSTEPS_CLEAN)));
QList<BuildConfigWidget *> subConfigWidgets = m_buildConfiguration->subConfigWidgets(); QList<BuildConfigWidget *> subConfigWidgets = m_buildConfiguration->createSubConfigWidgets();
foreach (BuildConfigWidget *subConfigWidget, subConfigWidgets) foreach (BuildConfigWidget *subConfigWidget, subConfigWidgets)
addSubWidget(subConfigWidget); addSubWidget(subConfigWidget);