From d7dc745bca6ffec3964b6735f31882c324a5b651 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Thu, 7 Apr 2011 16:34:13 +0200
Subject: [PATCH] Maemo: Allow tarball deployment for non-Harmattan targets.

---
 .../qt-maemo/maemodeploystepfactory.cpp             |  5 +++--
 .../qt-maemo/maemopackagecreationfactory.cpp        | 13 ++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepfactory.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepfactory.cpp
index 20c51b9b515..699eb47159b 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepfactory.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepfactory.cpp
@@ -69,11 +69,12 @@ QStringList MaemoDeployStepFactory::availableCreationIds(BuildStepList *parent)
     QStringList ids;
     if (qobject_cast<AbstractQt4MaemoTarget *>(parent->target()))
         ids << MaemoCopyToSysrootStep::Id;
+    if (!qobject_cast<Qt4HarmattanTarget *>(parent->target()))
+        ids << MaemoUploadAndInstallTarPackageStep::Id;
     if (qobject_cast<AbstractDebBasedQt4MaemoTarget *>(parent->target())) {
         ids << MaemoInstallDebianPackageToSysrootStep::Id;
         ids << MaemoUploadAndInstallDpkgPackageStep::Id;
-    }
-    else if (qobject_cast<AbstractRpmBasedQt4MaemoTarget *>(parent->target())) {
+    } else if (qobject_cast<AbstractRpmBasedQt4MaemoTarget *>(parent->target())) {
         ids << MaemoInstallRpmPackageToSysrootStep::Id;
         ids << MaemoUploadAndInstallRpmPackageStep::Id;
     }
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationfactory.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationfactory.cpp
index b2dd5207819..8745d7ccff0 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationfactory.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationfactory.cpp
@@ -74,16 +74,19 @@ QStringList MaemoPackageCreationFactory::availableCreationIds(ProjectExplorer::B
     if (!qobject_cast<Qt4MaemoDeployConfiguration *>(parent->parent()))
         return QStringList();
 
+    QStringList ids;
     if (qobject_cast<AbstractDebBasedQt4MaemoTarget *>(parent->target())
             && !parent->contains(MaemoDebianPackageCreationStep::CreatePackageId)) {
-        return QStringList() << MaemoDebianPackageCreationStep::CreatePackageId;
+        ids << MaemoDebianPackageCreationStep::CreatePackageId;
     } else if (qobject_cast<AbstractRpmBasedQt4MaemoTarget *>(parent->target())
                && !parent->contains(MaemoRpmPackageCreationStep::CreatePackageId)) {
-        return QStringList() << MaemoRpmPackageCreationStep::CreatePackageId;
-    } else if (!parent->contains(MaemoTarPackageCreationStep::CreatePackageId)) {
-        return QStringList() << MaemoTarPackageCreationStep::CreatePackageId;
+        ids << MaemoRpmPackageCreationStep::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