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

Move Project::subConfigWidgets to BuildConfiguration

Browse Source 
Change-Id: Idf58ebbb02e9cd0ab4ff7e74fbed17250e274693
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Daniel Teske
2012-11-08 16:10:34 +01:00
parent 36718cae2c
commit e08b38ffd6
23 changed files with 42 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
+7
View File
@@ -38,6 +38,7 @@
#include "autoreconfstep.h"
#include "configurestep.h"
#include <projectexplorer/buildenvironmentwidget.h>
#include <projectexplorer/buildsteplist.h>
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/projectexplorerconstants.h>
@@ -70,6 +71,12 @@ 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)
{
src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h
+1
View File
@@ -49,6 +49,7 @@ public:
explicit AutotoolsBuildConfiguration(ProjectExplorer::Target *parent);
ProjectExplorer::BuildConfigWidget *createConfigWidget();
QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets();
QString buildDirectory() const;
void setBuildDirectory(const QString &buildDirectory);
src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
-6
View File
@@ -40,7 +40,6 @@
#include "makefileparserthread.h"
#include <projectexplorer/abi.h>
#include <projectexplorer/buildenvironmentwidget.h>
#include <projectexplorer/kitmanager.h>
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/buildconfiguration.h>
@@ -126,11 +125,6 @@ QString AutotoolsProject::defaultBuildDirectory() const
return projectDirectory();
}
QList<BuildConfigWidget *> AutotoolsProject::subConfigWidgets()
{
return QList<BuildConfigWidget *>() << new BuildEnvironmentWidget;
}
ProjectNode *AutotoolsProject::rootProjectNode() const
{
return m_rootNode;
src/plugins/autotoolsprojectmanager/autotoolsproject.h
-1
View File
@@ -74,7 +74,6 @@ public:
Core::Id id() const;
Core::IDocument *document() const;
ProjectExplorer::IProjectManager *projectManager() const;
QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets();
ProjectExplorer::ProjectNode *rootProjectNode() const;
QStringList files(FilesMode fileMode) const;
QString defaultBuildDirectory() const;
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+9
View File
@@ -33,6 +33,7 @@
#include "cmakeproject.h"
#include "cmakeprojectconstants.h"
#include <projectexplorer/buildenvironmentwidget.h>
#include <projectexplorer/buildsteplist.h>
#include <projectexplorer/gnumakeparser.h>
#include <projectexplorer/ioutputparser.h>
@@ -111,6 +112,14 @@ 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;
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
+1
View File
@@ -52,6 +52,7 @@ public:
~CMakeBuildConfiguration();
ProjectExplorer::BuildConfigWidget *createConfigWidget();
QList<ProjectExplorer::BuildConfigWidget *> subConfigWidgets();
QString buildDirectory() const;
void setBuildDirectory(const QString &buildDirectory);
src/plugins/cmakeprojectmanager/cmakeproject.cpp
-8
View File
@@ -41,7 +41,6 @@
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/headerpath.h>
#include <projectexplorer/buildenvironmentwidget.h>
#include <projectexplorer/buildsteplist.h>
#include <projectexplorer/buildmanager.h>
#include <projectexplorer/kitinformation.h>
@@ -512,13 +511,6 @@ CMakeManager *CMakeProject::projectManager() const
return m_manager;
}
QList<ProjectExplorer::BuildConfigWidget*> CMakeProject::subConfigWidgets()
{
QList<ProjectExplorer::BuildConfigWidget*> list;
list << new BuildEnvironmentWidget;
return list;
}
ProjectExplorer::ProjectNode *CMakeProject::rootProjectNode() const
{
return m_rootNode;
src/plugins/cmakeprojectmanager/cmakeproject.h
-2
View File
@@ -85,8 +85,6 @@ public:
Core::IDocument *document() const;
CMakeManager *projectManager() const;
QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets();
ProjectExplorer::ProjectNode *rootProjectNode() const;
QStringList files(FilesMode fileMode) const;
src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
+7
View File
@@ -32,6 +32,7 @@
#include "genericmakestep.h"
#include "genericproject.h"
#include <projectexplorer/buildenvironmentwidget.h>
#include <projectexplorer/buildsteplist.h>
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/projectexplorerconstants.h>
@@ -110,6 +111,12 @@ BuildConfigWidget *GenericBuildConfiguration::createConfigWidget()
return new GenericBuildSettingsWidget;
}
QList<BuildConfigWidget*> GenericBuildConfiguration::subConfigWidgets()
{
QList<BuildConfigWidget*> list;
list << new ProjectExplorer::BuildEnvironmentWidget;
return list;
}
/*!
\class GenericBuildConfigurationFactory
src/plugins/genericprojectmanager/genericbuildconfiguration.h
+1
View File
@@ -50,6 +50,7 @@ public:
explicit GenericBuildConfiguration(ProjectExplorer::Target *parent);
ProjectExplorer::BuildConfigWidget *createConfigWidget();
QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets();
QString buildDirectory() const;
QString rawBuildDirectory() const;
src/plugins/genericprojectmanager/genericproject.cpp
-8
View File
@@ -39,7 +39,6 @@
#include <cpptools/ModelManagerInterface.h>
#include <extensionsystem/pluginmanager.h>
#include <projectexplorer/abi.h>
#include <projectexplorer/buildenvironmentwidget.h>
#include <projectexplorer/buildsteplist.h>
#include <projectexplorer/headerpath.h>
#include <projectexplorer/kitinformation.h>
@@ -398,13 +397,6 @@ IProjectManager *GenericProject::projectManager() const
return m_manager;
}
QList<BuildConfigWidget*> GenericProject::subConfigWidgets()
{
QList<BuildConfigWidget*> list;
list << new BuildEnvironmentWidget;
return list;
}
GenericProjectNode *GenericProject::rootProjectNode() const
{
return m_rootNode;
src/plugins/genericprojectmanager/genericproject.h
-2
View File
@@ -64,8 +64,6 @@ public:
Core::IDocument *document() const;
ProjectExplorer::IProjectManager *projectManager() const;
QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets();
GenericProjectNode *rootProjectNode() const;
QStringList files(FilesMode fileMode) const;
src/plugins/projectexplorer/buildconfiguration.cpp
+5
View File
@@ -116,6 +116,11 @@ BuildConfiguration::~BuildConfiguration()
delete m_macroExpander;
}
QList<BuildConfigWidget*> BuildConfiguration::subConfigWidgets()
{
return QList<BuildConfigWidget*>();
}
Utils::AbstractMacroExpander *BuildConfiguration::macroExpander()
{
if (!m_macroExpander)
src/plugins/projectexplorer/buildconfiguration.h
+1
View File
@@ -61,6 +61,7 @@ public:
virtual QString buildDirectory() const = 0;
virtual BuildConfigWidget *createConfigWidget() = 0;
virtual QList<BuildConfigWidget*> subConfigWidgets();
// Maybe the BuildConfiguration is not the best place for the environment
Utils::Environment baseEnvironment() const;
src/plugins/projectexplorer/buildsettingspropertiespage.cpp
+1 -1
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_CLEAN)));
QList<BuildConfigWidget *> subConfigWidgets = m_target->project()->subConfigWidgets();
QList<BuildConfigWidget *> subConfigWidgets = m_buildConfiguration->subConfigWidgets();
foreach (BuildConfigWidget *subConfigWidget, subConfigWidgets)
addSubWidget(subConfigWidget);
src/plugins/projectexplorer/project.cpp
-4
View File
@@ -306,10 +306,6 @@ bool Project::restoreSettings()
return ok;
}
QList<BuildConfigWidget*> Project::subConfigWidgets()
{
return QList<BuildConfigWidget*>();
}
/*!
\brief Serialize all data into a QVariantMap.
src/plugins/projectexplorer/project.h
-2
View File
@@ -97,8 +97,6 @@ public:
void saveSettings();
bool restoreSettings();
virtual QList<BuildConfigWidget*> subConfigWidgets();
virtual ProjectNode *rootProjectNode() const = 0;
enum FilesMode { AllFiles, ExcludeGeneratedFiles };
src/plugins/qmlprojectmanager/qmlproject.cpp
-5
View File
@@ -301,11 +301,6 @@ bool QmlProject::supportsKit(ProjectExplorer::Kit *k, QString *errorMessage) con
return version;
}
QList<ProjectExplorer::BuildConfigWidget*> QmlProject::subConfigWidgets()
{
return QList<ProjectExplorer::BuildConfigWidget*>();
}
ProjectExplorer::ProjectNode *QmlProject::rootProjectNode() const
{
return m_rootNode;
src/plugins/qmlprojectmanager/qmlproject.h
-2
View File
@@ -68,8 +68,6 @@ public:
bool supportsKit(ProjectExplorer::Kit *k, QString *errorMessage) const;
QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets();
ProjectExplorer::ProjectNode *rootProjectNode() const;
QStringList files(FilesMode fileMode) const;
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+8
View File
@@ -39,6 +39,7 @@
#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>
@@ -189,6 +190,13 @@ 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
src/plugins/qt4projectmanager/qt4buildconfiguration.h
+1
View File
@@ -56,6 +56,7 @@ public:
~Qt4BuildConfiguration();
ProjectExplorer::BuildConfigWidget *createConfigWidget();
QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets();
QString buildDirectory() const;
bool shadowBuild() const;
QString shadowBuildDirectory() const;
src/plugins/qt4projectmanager/qt4project.cpp
-8
View File
@@ -55,7 +55,6 @@
#include <projectexplorer/toolchain.h>
#include <projectexplorer/headerpath.h>
#include <projectexplorer/target.h>
#include <projectexplorer/buildenvironmentwidget.h>
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectexplorerconstants.h>
@@ -1057,13 +1056,6 @@ bool Qt4Project::parseInProgress(const QString &proFilePath) const
return node && node->parseInProgress();
}
QList<BuildConfigWidget*> Qt4Project::subConfigWidgets()
{
QList<BuildConfigWidget*> subWidgets;
subWidgets << new BuildEnvironmentWidget;
return subWidgets;
}
void Qt4Project::collectAllfProFiles(QList<Qt4ProFileNode *> &list, Qt4ProFileNode *node)
{
list.append(node);
src/plugins/qt4projectmanager/qt4project.h
-2
View File
@@ -92,8 +92,6 @@ public:
virtual QStringList files(FilesMode fileMode) const;
virtual QString generatedUiHeader(const QString &formFile) const;
QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets();
QList<Qt4ProFileNode *> allProFiles() const;
QList<Qt4ProFileNode *> applicationProFiles() const;
bool hasApplicationProFile(const QString &path) const;