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/qt4projectmanager/qt4project.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/qt4projectmanager/qt4project.cpp')
| -rw-r--r-- | src/plugins/qt4projectmanager/qt4project.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp index 5b187c9865..5e20f185d3 100644 --- a/src/plugins/qt4projectmanager/qt4project.cpp +++ b/src/plugins/qt4projectmanager/qt4project.cpp @@ -36,7 +36,6 @@ #include "qt4runconfiguration.h" #include "qt4nodes.h" #include "qt4projectconfigwidget.h" -#include "qt4buildenvironmentwidget.h" #include "qt4projectmanagerconstants.h" #include "projectloadwizard.h" #include "qt4buildconfiguration.h" @@ -46,6 +45,7 @@ #include <coreplugin/coreconstants.h> #include <coreplugin/progressmanager/progressmanager.h> #include <extensionsystem/pluginmanager.h> +#include <projectexplorer/buildenvironmentwidget.h> #include <projectexplorer/customexecutablerunconfiguration.h> #include <projectexplorer/nodesvisitor.h> #include <projectexplorer/project.h> @@ -933,7 +933,7 @@ BuildConfigWidget *Qt4Project::createConfigWidget() QList<BuildConfigWidget*> Qt4Project::subConfigWidgets() { QList<BuildConfigWidget*> subWidgets; - subWidgets << new Qt4BuildEnvironmentWidget(this); + subWidgets << new BuildEnvironmentWidget; return subWidgets; } |