BuildConfiugration::subConfigWidge() Provide a default implementation

Which simply returns a BuildEnvironmentWidget. A long time ago
BuildConfigurations had no environment, nowdays they do. So it makes
sense for all BuildConfigurations to have the BuildEnvironmentWidget.

Change-Id: I824c45df79a0dcd2b624bf67a4730fb5dab098bc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

9 files changed, 2 insertions, 31 deletions

diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
index face86fcdb..727abdf1e3 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
@@ -38,7 +38,6 @@
 #include "autoreconfstep.h"
 #include "configurestep.h"
 
-#include <projectexplorer/buildenvironmentwidget.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/projectexplorerconstants.h>
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h
index a98eec649f..362dec94df 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h
+++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h
@@ -49,7 +49,6 @@ public:
     explicit AutotoolsBuildConfiguration(ProjectExplorer::Target *parent);
 
     ProjectExplorer::BuildConfigWidget *createConfigWidget();
-    QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets();
 
     QString buildDirectory() const;
     void setBuildDirectory(const QString &buildDirectory);
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index 88dcdc02fc..aacada4e38 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -33,7 +33,6 @@
 #include "cmakeproject.h"
 #include "cmakeprojectconstants.h"
 
-#include <projectexplorer/buildenvironmentwidget.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/gnumakeparser.h>
 #include <projectexplorer/ioutputparser.h>
@@ -112,14 +111,6 @@ ProjectExplorer::BuildConfigWidget *CMakeBuildConfiguration::createConfigWidget(
     return new CMakeBuildSettingsWidget;
 }
 
-QList<ProjectExplorer::BuildConfigWidget *> CMakeBuildConfiguration::subConfigWidgets()
-{
-    QList<ProjectExplorer::BuildConfigWidget*> list;
-    list << new ProjectExplorer::BuildEnvironmentWidget;
-    return list;
-}
-
-
 QString CMakeBuildConfiguration::buildDirectory() const
 {
     return m_buildDirectory;
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
index 7d8cfe38da..973766394c 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
@@ -52,7 +52,6 @@ public:
     ~CMakeBuildConfiguration();
 
     ProjectExplorer::BuildConfigWidget *createConfigWidget();
-    QList<ProjectExplorer::BuildConfigWidget *> subConfigWidgets();
     QString buildDirectory() const;
 
     void setBuildDirectory(const QString &buildDirectory);
diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
index 9769271614..e418751e15 100644
--- a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
+++ b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
@@ -32,7 +32,6 @@
 #include "genericmakestep.h"
 #include "genericproject.h"
 
-#include <projectexplorer/buildenvironmentwidget.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/projectexplorerconstants.h>
@@ -111,13 +110,6 @@ BuildConfigWidget *GenericBuildConfiguration::createConfigWidget()
     return new GenericBuildSettingsWidget;
 }
 
-QList<BuildConfigWidget*> GenericBuildConfiguration::subConfigWidgets()
-{
-    QList<BuildConfigWidget*> list;
-    list << new ProjectExplorer::BuildEnvironmentWidget;
-    return list;
-}
-
 /*!
   \class GenericBuildConfigurationFactory
 */
diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.h b/src/plugins/genericprojectmanager/genericbuildconfiguration.h
index c9774e25bf..f0e4f2ac95 100644
--- a/src/plugins/genericprojectmanager/genericbuildconfiguration.h
+++ b/src/plugins/genericprojectmanager/genericbuildconfiguration.h
@@ -50,7 +50,6 @@ public:
     explicit GenericBuildConfiguration(ProjectExplorer::Target *parent);
 
     ProjectExplorer::BuildConfigWidget *createConfigWidget();
-    QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets();
     QString buildDirectory() const;
 
     QString rawBuildDirectory() const;
diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp
index 42cbf9bdbe..441524f5a4 100644
--- a/src/plugins/projectexplorer/buildconfiguration.cpp
+++ b/src/plugins/projectexplorer/buildconfiguration.cpp
@@ -39,6 +39,7 @@
 #include "kit.h"
 
 #include <coreplugin/variablemanager.h>
+#include <projectexplorer/buildenvironmentwidget.h>
 #include <extensionsystem/pluginmanager.h>
 
 #include <utils/qtcassert.h>
@@ -118,7 +119,7 @@ BuildConfiguration::~BuildConfiguration()
 
 QList<BuildConfigWidget*> BuildConfiguration::subConfigWidgets()
 {
-    return QList<BuildConfigWidget*>();
+    return QList<BuildConfigWidget *>() << new ProjectExplorer::BuildEnvironmentWidget;
 }
 
 Utils::AbstractMacroExpander *BuildConfiguration::macroExpander()
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
index bf55009c67..1195499a1a 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
@@ -39,7 +39,6 @@
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
 #include <limits>
-#include <projectexplorer/buildenvironmentwidget.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
@@ -190,13 +189,6 @@ BuildConfigWidget *Qt4BuildConfiguration::createConfigWidget()
     return new Qt4ProjectConfigWidget(target());
 }
 
-QList<BuildConfigWidget*> Qt4BuildConfiguration::subConfigWidgets()
-{
-    QList<BuildConfigWidget*> subWidgets;
-    subWidgets << new ProjectExplorer::BuildEnvironmentWidget;
-    return subWidgets;
-}
-
 QString Qt4BuildConfiguration::defaultShadowBuildDirectory() const
 {
     // todo displayName isn't ideal
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.h b/src/plugins/qt4projectmanager/qt4buildconfiguration.h
index 42efcadb45..b2348b8306 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.h
@@ -56,7 +56,6 @@ public:
     ~Qt4BuildConfiguration();
 
     ProjectExplorer::BuildConfigWidget *createConfigWidget();
-    QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets();
     QString buildDirectory() const;
     bool shadowBuild() const;
     QString shadowBuildDirectory() const;