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

Maemo: Move INSTALLS information from package step to deploy step.

Browse Source 
... because the files are installed even when packaging is disabled.

Reviewed-by: kh1
This commit is contained in:
ck
2010-07-14 12:21:35 +02:00
parent d0cbac9032
commit 8a3c1cc0d4
15 changed files with 109 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -170,19 +170,12 @@ const QString MaemoRunConfiguration::gdbCmd() const
return QString();
}
const MaemoPackageCreationStep *MaemoRunConfiguration::packageStep() const
{
const MaemoPackageCreationStep * const step
= MaemoGlobal::buildStep<MaemoPackageCreationStep>(activeQt4BuildConfiguration());
Q_ASSERT(step && "Impossible: Maemo build configuration without packaging step.");
return step;
}
MaemoDeployStep *MaemoRunConfiguration::deployStep() const
{
MaemoDeployStep * const step
= MaemoGlobal::buildStep<MaemoDeployStep>(activeQt4BuildConfiguration());
Q_ASSERT(step && !"Impossible: Maemo build configuration without deploy step.");
Q_ASSERT_X(step, Q_FUNC_INFO,
"Impossible: Maemo build configuration without deploy step.");
return step;
}