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>
This commit is contained in:
Daniel Teske
2012-11-08 16:13:31 +01:00
parent e08b38ffd6
commit 613f3345e1
9 changed files with 2 additions and 31 deletions

View File

@@ -38,7 +38,6 @@
#include "autoreconfstep.h" #include "autoreconfstep.h"
#include "configurestep.h" #include "configurestep.h"
#include <projectexplorer/buildenvironmentwidget.h>
#include <projectexplorer/buildsteplist.h> #include <projectexplorer/buildsteplist.h>
#include <projectexplorer/kitinformation.h> #include <projectexplorer/kitinformation.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>

View File

@@ -49,7 +49,6 @@ public:
explicit AutotoolsBuildConfiguration(ProjectExplorer::Target *parent); explicit AutotoolsBuildConfiguration(ProjectExplorer::Target *parent);
ProjectExplorer::BuildConfigWidget *createConfigWidget(); ProjectExplorer::BuildConfigWidget *createConfigWidget();
QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets();
QString buildDirectory() const; QString buildDirectory() const;
void setBuildDirectory(const QString &buildDirectory); void setBuildDirectory(const QString &buildDirectory);

View File

@@ -33,7 +33,6 @@
#include "cmakeproject.h" #include "cmakeproject.h"
#include "cmakeprojectconstants.h" #include "cmakeprojectconstants.h"
#include <projectexplorer/buildenvironmentwidget.h>
#include <projectexplorer/buildsteplist.h> #include <projectexplorer/buildsteplist.h>
#include <projectexplorer/gnumakeparser.h> #include <projectexplorer/gnumakeparser.h>
#include <projectexplorer/ioutputparser.h> #include <projectexplorer/ioutputparser.h>
@@ -112,14 +111,6 @@ ProjectExplorer::BuildConfigWidget *CMakeBuildConfiguration::createConfigWidget(
return new CMakeBuildSettingsWidget; return new CMakeBuildSettingsWidget;
} }
QList<ProjectExplorer::BuildConfigWidget *> CMakeBuildConfiguration::subConfigWidgets()
{
QList<ProjectExplorer::BuildConfigWidget*> list;
list << new ProjectExplorer::BuildEnvironmentWidget;
return list;
}
QString CMakeBuildConfiguration::buildDirectory() const QString CMakeBuildConfiguration::buildDirectory() const
{ {
return m_buildDirectory; return m_buildDirectory;

View File

@@ -52,7 +52,6 @@ public:
~CMakeBuildConfiguration(); ~CMakeBuildConfiguration();
ProjectExplorer::BuildConfigWidget *createConfigWidget(); ProjectExplorer::BuildConfigWidget *createConfigWidget();
QList<ProjectExplorer::BuildConfigWidget *> subConfigWidgets();
QString buildDirectory() const; QString buildDirectory() const;
void setBuildDirectory(const QString &buildDirectory); void setBuildDirectory(const QString &buildDirectory);

View File

@@ -32,7 +32,6 @@
#include "genericmakestep.h" #include "genericmakestep.h"
#include "genericproject.h" #include "genericproject.h"
#include <projectexplorer/buildenvironmentwidget.h>
#include <projectexplorer/buildsteplist.h> #include <projectexplorer/buildsteplist.h>
#include <projectexplorer/kitinformation.h> #include <projectexplorer/kitinformation.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
@@ -111,13 +110,6 @@ BuildConfigWidget *GenericBuildConfiguration::createConfigWidget()
return new GenericBuildSettingsWidget; return new GenericBuildSettingsWidget;
} }
QList<BuildConfigWidget*> GenericBuildConfiguration::subConfigWidgets()
{
QList<BuildConfigWidget*> list;
list << new ProjectExplorer::BuildEnvironmentWidget;
return list;
}
/*! /*!
\class GenericBuildConfigurationFactory \class GenericBuildConfigurationFactory
*/ */

View File

@@ -50,7 +50,6 @@ public:
explicit GenericBuildConfiguration(ProjectExplorer::Target *parent); explicit GenericBuildConfiguration(ProjectExplorer::Target *parent);
ProjectExplorer::BuildConfigWidget *createConfigWidget(); ProjectExplorer::BuildConfigWidget *createConfigWidget();
QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets();
QString buildDirectory() const; QString buildDirectory() const;
QString rawBuildDirectory() const; QString rawBuildDirectory() const;

View File

@@ -39,6 +39,7 @@
#include "kit.h" #include "kit.h"
#include <coreplugin/variablemanager.h> #include <coreplugin/variablemanager.h>
#include <projectexplorer/buildenvironmentwidget.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
@@ -118,7 +119,7 @@ BuildConfiguration::~BuildConfiguration()
QList<BuildConfigWidget*> BuildConfiguration::subConfigWidgets() QList<BuildConfigWidget*> BuildConfiguration::subConfigWidgets()
{ {
return QList<BuildConfigWidget*>(); return QList<BuildConfigWidget *>() << new ProjectExplorer::BuildEnvironmentWidget;
} }
Utils::AbstractMacroExpander *BuildConfiguration::macroExpander() Utils::AbstractMacroExpander *BuildConfiguration::macroExpander()

View File

@@ -39,7 +39,6 @@
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/qtcprocess.h> #include <utils/qtcprocess.h>
#include <limits> #include <limits>
#include <projectexplorer/buildenvironmentwidget.h>
#include <projectexplorer/buildsteplist.h> #include <projectexplorer/buildsteplist.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
@@ -190,13 +189,6 @@ BuildConfigWidget *Qt4BuildConfiguration::createConfigWidget()
return new Qt4ProjectConfigWidget(target()); return new Qt4ProjectConfigWidget(target());
} }
QList<BuildConfigWidget*> Qt4BuildConfiguration::subConfigWidgets()
{
QList<BuildConfigWidget*> subWidgets;
subWidgets << new ProjectExplorer::BuildEnvironmentWidget;
return subWidgets;
}
QString Qt4BuildConfiguration::defaultShadowBuildDirectory() const QString Qt4BuildConfiguration::defaultShadowBuildDirectory() const
{ {
// todo displayName isn't ideal // todo displayName isn't ideal

View File

@@ -56,7 +56,6 @@ public:
~Qt4BuildConfiguration(); ~Qt4BuildConfiguration();
ProjectExplorer::BuildConfigWidget *createConfigWidget(); ProjectExplorer::BuildConfigWidget *createConfigWidget();
QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets();
QString buildDirectory() const; QString buildDirectory() const;
bool shadowBuild() const; bool shadowBuild() const;
QString shadowBuildDirectory() const; QString shadowBuildDirectory() const;