feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Maemo: Adapt to new deploy configuration approach.

Browse Source 
Reviewed-by: Tobias Hunger
This commit is contained in:
ck
2010-08-02 16:01:02 +02:00
parent bf877d0aae
commit cbf31293cb
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
View File

@@ -158,7 +158,7 @@ void MaemoDeployStep::getDeployTimesFromMap(const QVariantMap &map)
const MaemoPackageCreationStep *MaemoDeployStep::packagingStep() const const MaemoPackageCreationStep *MaemoDeployStep::packagingStep() const
{ {
const MaemoPackageCreationStep * const step const MaemoPackageCreationStep * const step
= MaemoGlobal::buildStep<MaemoPackageCreationStep>(buildConfiguration()); = MaemoGlobal::buildStep<MaemoPackageCreationStep>(target()->activeDeployConfiguration());
Q_ASSERT_X(step, Q_FUNC_INFO, Q_ASSERT_X(step, Q_FUNC_INFO,
"Impossible: Maemo build configuration without packaging step."); "Impossible: Maemo build configuration without packaging step.");
return step; return step;

6
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
View File

@@ -30,7 +30,7 @@
#ifndef MAEMOGLOBAL_H #ifndef MAEMOGLOBAL_H
#define MAEMOGLOBAL_H #define MAEMOGLOBAL_H
#include <projectexplorer/buildconfiguration.h> #include <projectexplorer/deployconfiguration.h>
#include <projectexplorer/environment.h> #include <projectexplorer/environment.h>
#include <projectexplorer/buildsteplist.h> #include <projectexplorer/buildsteplist.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
@@ -53,9 +53,9 @@ public:
static QString remoteEnvironment(const QList<ProjectExplorer::EnvironmentItem> &list); static QString remoteEnvironment(const QList<ProjectExplorer::EnvironmentItem> &list);
static QString remoteProjectSourcesMountPoint(); 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) if (!bsl)
return 0; return 0;
const QList<ProjectExplorer::BuildStep *> &buildSteps = bsl->steps(); const QList<ProjectExplorer::BuildStep *> &buildSteps = bsl->steps();

2
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
View File

@@ -328,7 +328,7 @@ const MaemoToolChain *MaemoPackageCreationStep::maemoToolChain() const
MaemoDeployStep *MaemoPackageCreationStep::deployStep() const MaemoDeployStep *MaemoPackageCreationStep::deployStep() const
{ {
MaemoDeployStep * const deployStep MaemoDeployStep * const deployStep
= MaemoGlobal::buildStep<MaemoDeployStep>(buildConfiguration()); = MaemoGlobal::buildStep<MaemoDeployStep>(target()->activeDeployConfiguration());
Q_ASSERT(deployStep && Q_ASSERT(deployStep &&
"Fatal error: Maemo build configuration without deploy step."); "Fatal error: Maemo build configuration without deploy step.");
return deployStep; return deployStep;

2
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
View File

@@ -204,7 +204,7 @@ const QString MaemoRunConfiguration::gdbCmd() const
MaemoDeployStep *MaemoRunConfiguration::deployStep() const MaemoDeployStep *MaemoRunConfiguration::deployStep() const
{ {
MaemoDeployStep * const step MaemoDeployStep * const step
= MaemoGlobal::buildStep<MaemoDeployStep>(activeQt4BuildConfiguration()); = MaemoGlobal::buildStep<MaemoDeployStep>(target()->activeDeployConfiguration());
Q_ASSERT_X(step, Q_FUNC_INFO, Q_ASSERT_X(step, Q_FUNC_INFO,
"Impossible: Maemo build configuration without deploy step."); "Impossible: Maemo build configuration without deploy step.");
return step; return step;