diff options
| author | Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> | 2010-03-11 17:47:09 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> | 2010-03-12 13:01:04 +0100 |
| commit | 2a93b5401d6fa73a1017a7f0b64f443defd90bed (patch) | |
| tree | 0ba0c9eba6871f4505fc397821872d8f9ec76197 /src/plugins/genericprojectmanager/genericproject.cpp | |
| parent | 434e51c6beee3763bf21fcfe11758e8442de9549 (diff) | |
| download | qt-creator-2a93b5401d6fa73a1017a7f0b64f443defd90bed.tar.gz | |
Move build environment customization down to BuildConfiguration
The functionality was duplicated between the Qt4 and CMake build
configurations and their configuration widgets. This change moves it
down to BuildConfiguration, in addition also making it available for the
Generic Project.
Also provides an upgrade path for the configuration.
Task-number: QTCREATOR-24
Reviewed-by: dt
Reviewed-by: Tobias Hunger
Diffstat (limited to 'src/plugins/genericprojectmanager/genericproject.cpp')
| -rw-r--r-- | src/plugins/genericprojectmanager/genericproject.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index 91fb002b3f..5a1c3f1343 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -33,6 +33,7 @@ #include "genericprojectconstants.h" #include "generictarget.h" +#include <projectexplorer/buildenvironmentwidget.h> #include <projectexplorer/toolchain.h> #include <projectexplorer/projectexplorerconstants.h> #include <cpptools/cppmodelmanagerinterface.h> @@ -399,7 +400,9 @@ ProjectExplorer::BuildConfigWidget *GenericProject::createConfigWidget() QList<ProjectExplorer::BuildConfigWidget*> GenericProject::subConfigWidgets() { - return QList<ProjectExplorer::BuildConfigWidget*>(); + QList<ProjectExplorer::BuildConfigWidget*> list; + list << new BuildEnvironmentWidget; + return list; } GenericProjectNode *GenericProject::rootProjectNode() const |