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

Maemo: Factor out redundant code.

Browse Source
This commit is contained in:
ck
2010-07-13 17:16:23 +02:00
parent e17b99e7f3
commit 9b30763e9d
4 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,7 @@
#include "maemorunconfiguration.h"
#include "maemodeploystep.h"
#include "maemoglobal.h"
#include "maemopackagecreationstep.h"
#include "maemorunconfigurationwidget.h"
#include "maemotoolchain.h"
@@ -171,30 +172,18 @@ const QString MaemoRunConfiguration::gdbCmd() const
const MaemoPackageCreationStep *MaemoRunConfiguration::packageStep() const
{
const QList<ProjectExplorer::BuildStep *> &buildSteps
= activeQt4BuildConfiguration()->steps(ProjectExplorer::BuildStep::Deploy);
for (int i = buildSteps.count() - 1; i >= 0; --i) {
const MaemoPackageCreationStep * const pStep
= qobject_cast<MaemoPackageCreationStep *>(buildSteps.at(i));
if (pStep)
return pStep;
}
Q_ASSERT(!"Impossible: Maemo run configuration without packaging step.");
return 0;
const MaemoPackageCreationStep * const step
= MaemoGlobal::buildStep<MaemoPackageCreationStep>(activeQt4BuildConfiguration());
Q_ASSERT(step && "Impossible: Maemo build configuration without packaging step.");
return step;
}
MaemoDeployStep *MaemoRunConfiguration::deployStep() const
{
const QList<ProjectExplorer::BuildStep *> &buildSteps
= activeQt4BuildConfiguration()->steps(ProjectExplorer::BuildStep::Deploy);
for (int i = buildSteps.count() - 1; i >= 0; --i) {
MaemoDeployStep * const step
= qobject_cast<MaemoDeployStep*>(buildSteps.at(i));
if (step)
return step;
}
Q_ASSERT(!"Impossible: Maemo run configuration without deploy step.");
return 0;
MaemoDeployStep * const step
= MaemoGlobal::buildStep<MaemoDeployStep>(activeQt4BuildConfiguration());
Q_ASSERT(step && !"Impossible: Maemo build configuration without deploy step.");
return step;
}
QString MaemoRunConfiguration::maddeRoot() const