Maemo: Adapt to new deploy configuration approach.

Reviewed-by: Tobias Hunger

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
index 61bbcc8..39d65d4 100644 (file)
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
@@ -158,7 +158,7 @@ void MaemoDeployStep::getDeployTimesFromMap(const QVariantMap &map)
 const MaemoPackageCreationStep *MaemoDeployStep::packagingStep() const
 {
     const MaemoPackageCreationStep * const step
-        = MaemoGlobal::buildStep<MaemoPackageCreationStep>(buildConfiguration());
+        = MaemoGlobal::buildStep<MaemoPackageCreationStep>(target()->activeDeployConfiguration());
     Q_ASSERT_X(step, Q_FUNC_INFO,
         "Impossible: Maemo build configuration without packaging step.");
     return step;

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h b/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
index cd98d3b..a43edb6 100644 (file)
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
@@ -30,7 +30,7 @@
 #ifndef MAEMOGLOBAL_H
 #define MAEMOGLOBAL_H
 
-#include <projectexplorer/buildconfiguration.h>
+#include <projectexplorer/deployconfiguration.h>
 #include <projectexplorer/environment.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/projectexplorerconstants.h>
@@ -53,9 +53,9 @@ public:
     static QString remoteEnvironment(const QList<ProjectExplorer::EnvironmentItem> &list);
     static QString remoteProjectSourcesMountPoint();
 
-    template<class T> static T *buildStep(const ProjectExplorer::BuildConfiguration *bc)
+    template<class T> static T *buildStep(const ProjectExplorer::DeployConfiguration *dc)
     {
-        ProjectExplorer::BuildStepList *bsl = bc->stepList(QLatin1String(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY));
+        ProjectExplorer::BuildStepList *bsl = dc->stepList();
         if (!bsl)
             return 0;
         const QList<ProjectExplorer::BuildStep *> &buildSteps = bsl->steps();

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
index f3da6f1..6769d6d 100644 (file)
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
@@ -328,7 +328,7 @@ const MaemoToolChain *MaemoPackageCreationStep::maemoToolChain() const
 MaemoDeployStep *MaemoPackageCreationStep::deployStep() const
 {
     MaemoDeployStep * const deployStep
-        = MaemoGlobal::buildStep<MaemoDeployStep>(buildConfiguration());
+        = MaemoGlobal::buildStep<MaemoDeployStep>(target()->activeDeployConfiguration());
     Q_ASSERT(deployStep &&
         "Fatal error: Maemo build configuration without deploy step.");
     return deployStep;

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
index 47779f6..4a714c9 100644 (file)
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
@@ -204,7 +204,7 @@ const QString MaemoRunConfiguration::gdbCmd() const
 MaemoDeployStep *MaemoRunConfiguration::deployStep() const
 {
     MaemoDeployStep * const step
-        = MaemoGlobal::buildStep<MaemoDeployStep>(activeQt4BuildConfiguration());
+        = MaemoGlobal::buildStep<MaemoDeployStep>(target()->activeDeployConfiguration());
     Q_ASSERT_X(step, Q_FUNC_INFO,
         "Impossible: Maemo build configuration without deploy step.");
     return step;