diff options
| author | Tobias Hunger <[email protected]> | 2010-07-16 14:00:41 +0200 |
|---|---|---|
| committer | Tobias Hunger <[email protected]> | 2010-08-02 14:21:05 +0200 |
| commit | ee4a04a20b2af6d6ffb5f8b1d938d18ca21ef157 (patch) | |
| tree | 5f5e905180d2f80865c7adbc46e6767fb18de408 /src/plugins/cmakeprojectmanager/cmakeproject.cpp | |
| parent | cc93a08b1b3605f05a61e47c0e5a4aeb5dbdf913 (diff) | |
Refactor deployment
* Add a DeployConfiguration class to hold settings related
to deployment.
* Add BuildStepsList to hold a list of buildsteps
* Update BuildConfiguration to use BuildStepLists instead of
manageing lists of buildsteps itself.
* Update BuildManager to use BuildStepLists in its interfaces
* Fix fallout introduced by API changes
* Update .user file to new way of storing settings
Task-number: QTCREATORBUG-1427
Task-number: QTCREATORBUG-1428
Task-number: QTCREATORBUG-1811
Task-number: QTCREATORBUG-1930
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakeproject.cpp')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeproject.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index 7335905ffb5..924454fbfa7 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -38,6 +38,7 @@ #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/buildenvironmentwidget.h> +#include <projectexplorer/buildsteplist.h> #include <cpptools/cppmodelmanagerinterface.h> #include <extensionsystem/pluginmanager.h> #include <utils/qtcassert.h> @@ -410,7 +411,7 @@ QString CMakeProject::displayName() const QString CMakeProject::id() const { - return QLatin1String("CMakeProjectManager.CMakeProject"); + return QLatin1String(Constants::CMAKEPROJECT_ID); } Core::IFile *CMakeProject::file() const @@ -521,7 +522,7 @@ bool CMakeProject::fromMap(const QVariantMap &map) if (!hasUserFile && hasBuildTarget("all")) { MakeStep *makeStep = qobject_cast<MakeStep *>( - activeTarget()->activeBuildConfiguration()->steps(ProjectExplorer::BuildStep::Build).at(0)); + activeTarget()->activeBuildConfiguration()->stepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD)->at(0)); Q_ASSERT(makeStep); makeStep->setBuildTarget("all", true); } |