From 7edc45a23a4b8ac3009d6f691a84021c8d2c1d44 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Tue, 2 Nov 2010 14:26:24 +0100
Subject: [PATCH] Maemo: Re-enable package installation via UTFS mount.

---
 src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp   | 2 --
 src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp | 2 --
 src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.h      | 5 +----
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
index 8e085b11b3c..b2f62cbf61c 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
@@ -422,11 +422,9 @@ void MaemoDeployStep::handleUnmounted()
 
     switch (m_unmountState) {
     case OldDirsUnmount:
-#if 0 // TODO: Disabled for 2.1. Re-enable later or throw away for good.
         if (toolChain()->allowsRemoteMounts())
             setupMount();
         else
-#endif
             prepareSftpConnection();
         break;
     case CurrentDirsUnmount:
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp
index d13f8639c0f..3a313dc1f87 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp
@@ -168,10 +168,8 @@ bool MaemoRunControlFactory::canRun(RunConfiguration *runConfiguration,
         return false;
     const int freePortCount = maemoRunConfig->freePorts().count();
 
-#if 0 // TODO: Enable if deployment-via-mount is enabled again, otherwise throw away.
     if (maemoRunConfig->toolchain()->allowsRemoteMounts() && freePortCount == 0)
         return false;
-#endif
     const int mountDirCount
         = maemoRunConfig->toolchain()->allowsRemoteMounts()
             ? maemoRunConfig->remoteMounts()->validMountSpecificationCount()
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.h b/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.h
index 85caf3c3032..fed364b3b5a 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.h
@@ -55,10 +55,7 @@ public:
     enum MaemoVersion { Maemo5, Maemo6 };
     MaemoVersion version() const;
     bool allowsRemoteMounts() const { return version() == Maemo5; }
-
-    // TODO: Perhaps re-enable when we deploy via UTFS again, otherwise throw the whole function away.
-    bool allowsPackagingDisabling() const { return /* version() == Maemo5 */ false; }
-
+    bool allowsPackagingDisabling() const { return version() == Maemo5; }
     bool allowsQmlDebugging() const { return version() == Maemo6; }
 
 protected: