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(buildConfiguration()); + = MaemoGlobal::buildStep(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 +#include #include #include #include @@ -53,9 +53,9 @@ public: static QString remoteEnvironment(const QList &list); static QString remoteProjectSourcesMountPoint(); - template static T *buildStep(const ProjectExplorer::BuildConfiguration *bc) + template 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 &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(buildConfiguration()); + = MaemoGlobal::buildStep(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(activeQt4BuildConfiguration()); + = MaemoGlobal::buildStep(target()->activeDeployConfiguration()); Q_ASSERT_X(step, Q_FUNC_INFO, "Impossible: Maemo build configuration without deploy step."); return step;