Maemo: Always deploy via SFTP upload.

The UTFS stuff does not seem to be reliable enough at the moment.
Deploying is too important to take that risk.

Reviewed-by: kh1
Reviewed-by: Leena Miettinen

5 files changed, 13 insertions, 12 deletions

diff --git a/dist/changes-2.1.0 b/dist/changes-2.1.0
index f70f20c40d..e542e9849b 100644
--- a/dist/changes-2.1.0
+++ b/dist/changes-2.1.0
@@ -98,8 +98,7 @@ Maemo Target
    * Deployment information is taken from .pro file's INSTALLS variable
    * Support for "subdirs" and library project types
    * Projects created by mobile wizards are now usable for Maemo development
-   * Automatic creation and deployment of Desktop files for application projects
-   * Fremantle: Support for exporting host directories to the device (also employed for zero-copy deployment)
+   * Fremantle: Support for exporting host directories to the device
 
 Designer
    * Added switching between code and forms using Shift-F4
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index 0e2dd5ba0f..6a115fbc54 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -2939,8 +2939,8 @@
         Qt Creator uses the compiler specified in the MADDE toolchain to
         build the application.
 
-        Qt Creator generates an installation package, installs in on the device,
-        and executes it. You can skip the packaging step to save some time.
+        Qt Creator generates an installation package, installs it on the device,
+        and executes the selected application.
         The application views are displayed on the Nokia N900.
         Command-line
         output is visible in the Qt Creator \gui {Application Output} view.
@@ -3406,12 +3406,6 @@
     You can specify settings for deploying applications to Maemo devices in the
     project .pro file. You can view the settings in the \gui {Run Settings}.
 
-    When you test your application on a device or the Maemo emulator, you can
-    save some time by installing the built files directly on the connected device
-    without packaging. Select the \gui {Skip packaging step} check box in the
-    \gui {Create Package} step. However, this is not recommended and is only supported
-    for simple application projects.
-
     The files to be installed are listed in the
     \gui {Deploy to Device} step, the \gui {Files to install} field. The
     \gui {Local File Path} field displays the location of the file on the development
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
index d9e2b70259..1481ec1dd6 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
@@ -408,9 +408,11 @@ 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 49c42bef3c..d13f8639c0 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp
@@ -167,8 +167,11 @@ bool MaemoRunControlFactory::canRun(RunConfiguration *runConfiguration,
         || maemoRunConfig->remoteExecutableFilePath().isEmpty())
         return false;
     const int freePortCount = maemoRunConfig->freePorts().count();
-    if (freePortCount == 0)
+
+#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 edda2c25d7..d7163022b7 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.h
@@ -55,7 +55,10 @@ public:
     enum MaemoVersion { Maemo5, Maemo6 };
     MaemoVersion version() const;
     bool allowsRemoteMounts() const { return version() == Maemo5; }
-    bool allowsPackagingDisabling() 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 allowsQmlDebugging() const { return version() == Maemo6; }
 
 protected: