summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
authorDaniel Teske <daniel.teske@digia.com>2012-11-08 16:15:45 +0100
committerDaniel Teske <daniel.teske@digia.com>2012-11-16 14:40:18 +0100
commit241f36f89d8949f34371ac8073a2f4c113dec753 (patch)
tree5557dc4695b1dfeac166ece0088ac666d369f48e /src/plugins
parent613f3345e19889935814841c74ec015456bc3a61 (diff)
downloadqt-creator-241f36f89d8949f34371ac8073a2f4c113dec753.tar.gz
BuildConfiugration: Rename subConfigWidgets to createSubConfigWidgets
Indicating that new widgets are indeed created. Change-Id: Iccc5e1e99f536fdfb0718f252a23f498053ad3a3 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp6
-rw-r--r--src/plugins/projectexplorer/buildconfiguration.cpp2
-rw-r--r--src/plugins/projectexplorer/buildconfiguration.h2
-rw-r--r--src/plugins/projectexplorer/buildsettingspropertiespage.cpp2
4 files changed, 3 insertions, 9 deletions
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
index 727abdf1e3..fe6ec93f70 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
@@ -70,12 +70,6 @@ BuildConfigWidget *AutotoolsBuildConfiguration::createConfigWidget()
return new AutotoolsBuildSettingsWidget;
}
-QList<BuildConfigWidget *> AutotoolsBuildConfiguration::subConfigWidgets()
-{
- return QList<BuildConfigWidget *>() << new ProjectExplorer::BuildEnvironmentWidget;
-}
-
-
AutotoolsBuildConfiguration::AutotoolsBuildConfiguration(ProjectExplorer::Target *parent, const Core::Id id)
: BuildConfiguration(parent, id)
{
diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp
index 441524f5a4..7284d78de9 100644
--- a/src/plugins/projectexplorer/buildconfiguration.cpp
+++ b/src/plugins/projectexplorer/buildconfiguration.cpp
@@ -117,7 +117,7 @@ BuildConfiguration::~BuildConfiguration()
delete m_macroExpander;
}
-QList<BuildConfigWidget*> BuildConfiguration::subConfigWidgets()
+QList<BuildConfigWidget*> BuildConfiguration::createSubConfigWidgets()
{
return QList<BuildConfigWidget *>() << new ProjectExplorer::BuildEnvironmentWidget;
}
diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h
index 959e18bf8e..33a96b8c45 100644
--- a/src/plugins/projectexplorer/buildconfiguration.h
+++ b/src/plugins/projectexplorer/buildconfiguration.h
@@ -61,7 +61,7 @@ public:
virtual QString buildDirectory() const = 0;
virtual BuildConfigWidget *createConfigWidget() = 0;
- virtual QList<BuildConfigWidget*> subConfigWidgets();
+ virtual QList<BuildConfigWidget*> createSubConfigWidgets();
// Maybe the BuildConfiguration is not the best place for the environment
Utils::Environment baseEnvironment() const;
diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
index 10be21edd1..4854541826 100644
--- a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
@@ -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_CLEAN)));
- QList<BuildConfigWidget *> subConfigWidgets = m_buildConfiguration->subConfigWidgets();
+ QList<BuildConfigWidget *> subConfigWidgets = m_buildConfiguration->createSubConfigWidgets();
foreach (BuildConfigWidget *subConfigWidget, subConfigWidgets)
addSubWidget(subConfigWidget);