From cbf31293cba952e0c9521ed9e7340d5423b7d7df Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Mon, 2 Aug 2010 16:01:02 +0200
Subject: [PATCH] Maemo: Adapt to new deploy configuration approach.
Reviewed-by: Tobias Hunger
---
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp | 2 +-
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h | 6 +++---
.../qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp | 2 +-
.../qt4projectmanager/qt-maemo/maemorunconfiguration.cpp | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
index 61bbcc82e21..39d65d48b2c 100644
--- 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 cd98d3bfc34..a43edb67246 100644
--- 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 f3da6f1c111..6769d6de2f1 100644
--- 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 47779f618fd..4a714c9ff61 100644
--- 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;
--
GitLab