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

Maemo: Allow tarball deployment for non-Harmattan targets.

Browse Source
This commit is contained in:
Christian Kandeler
2011-04-07 16:34:13 +02:00
parent 4efcc46d10
commit d7dc745bca
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qt4projectmanager/qt-maemo/maemodeploystepfactory.cpp
View File

@@ -69,11 +69,12 @@ QStringList MaemoDeployStepFactory::availableCreationIds(BuildStepList *parent)
QStringList ids; QStringList ids;
if (qobject_cast<AbstractQt4MaemoTarget *>(parent->target())) if (qobject_cast<AbstractQt4MaemoTarget *>(parent->target()))
ids << MaemoCopyToSysrootStep::Id; ids << MaemoCopyToSysrootStep::Id;
if (!qobject_cast<Qt4HarmattanTarget *>(parent->target()))
ids << MaemoUploadAndInstallTarPackageStep::Id;
if (qobject_cast<AbstractDebBasedQt4MaemoTarget *>(parent->target())) { if (qobject_cast<AbstractDebBasedQt4MaemoTarget *>(parent->target())) {
ids << MaemoInstallDebianPackageToSysrootStep::Id; ids << MaemoInstallDebianPackageToSysrootStep::Id;
ids << MaemoUploadAndInstallDpkgPackageStep::Id; ids << MaemoUploadAndInstallDpkgPackageStep::Id;
} } else if (qobject_cast<AbstractRpmBasedQt4MaemoTarget *>(parent->target())) {
else if (qobject_cast<AbstractRpmBasedQt4MaemoTarget *>(parent->target())) {
ids << MaemoInstallRpmPackageToSysrootStep::Id; ids << MaemoInstallRpmPackageToSysrootStep::Id;
ids << MaemoUploadAndInstallRpmPackageStep::Id; ids << MaemoUploadAndInstallRpmPackageStep::Id;
} }

13
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationfactory.cpp
View File

@@ -74,16 +74,19 @@ QStringList MaemoPackageCreationFactory::availableCreationIds(ProjectExplorer::B
if (!qobject_cast<Qt4MaemoDeployConfiguration *>(parent->parent())) if (!qobject_cast<Qt4MaemoDeployConfiguration *>(parent->parent()))
return QStringList(); return QStringList();
QStringList ids;
if (qobject_cast<AbstractDebBasedQt4MaemoTarget *>(parent->target()) if (qobject_cast<AbstractDebBasedQt4MaemoTarget *>(parent->target())
&& !parent->contains(MaemoDebianPackageCreationStep::CreatePackageId)) { && !parent->contains(MaemoDebianPackageCreationStep::CreatePackageId)) {
return QStringList() << MaemoDebianPackageCreationStep::CreatePackageId; ids << MaemoDebianPackageCreationStep::CreatePackageId;
} else if (qobject_cast<AbstractRpmBasedQt4MaemoTarget *>(parent->target()) } else if (qobject_cast<AbstractRpmBasedQt4MaemoTarget *>(parent->target())
&& !parent->contains(MaemoRpmPackageCreationStep::CreatePackageId)) { && !parent->contains(MaemoRpmPackageCreationStep::CreatePackageId)) {
return QStringList() << MaemoRpmPackageCreationStep::CreatePackageId; ids << MaemoRpmPackageCreationStep::CreatePackageId;
} else if (!parent->contains(MaemoTarPackageCreationStep::CreatePackageId)) {
return QStringList() << MaemoTarPackageCreationStep::CreatePackageId;
} }
return QStringList(); if (!qobject_cast<Qt4HarmattanTarget *>(parent->target())
&& !parent->contains(MaemoTarPackageCreationStep::CreatePackageId)) {
ids << MaemoTarPackageCreationStep::CreatePackageId;
}
return ids;
} }
QString MaemoPackageCreationFactory::displayNameForId(const QString &id) const QString MaemoPackageCreationFactory::displayNameForId(const QString &id) const