Maemo: Fix deployment issues with disabled packaging.

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
index 9d0f4a2..63519a5 100644 (file)
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
@@ -352,8 +352,10 @@ void MaemoDeployStep::start()
         const int deployableCount = m_deployables->deployableCount();
         for (int i = 0; i < deployableCount; ++i) {
             const MaemoDeployable &d = m_deployables->deployableAt(i);
-            if (currentlyNeedsDeployment(hostName, d))
+            if (currentlyNeedsDeployment(hostName, d)
+                || QFileInfo(d.localFilePath).isDir()) {
                 m_filesToCopy << d;
+            }
         }
     }
 
@@ -650,6 +652,8 @@ void MaemoDeployStep::installToSysroot()
                 + d.remoteDir + sep + QFileInfo(d.localFilePath).fileName();
             sysRootDir.mkpath(d.remoteDir.mid(1));
             QFile::remove(targetFilePath);
+            QString dummy;
+            MaemoGlobal::removeRecursively(targetFilePath, dummy);
             if (!MaemoGlobal::copyRecursively(d.localFilePath, targetFilePath)) {
                 writeOutput(tr("Sysroot installation failed: "
                     "Could not copy '%1' to '%2'. Continuing anyway.")

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
index cc89d2b..3b1c64a 100644 (file)
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
@@ -30,7 +30,6 @@
 ** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
-
 #include "maemoglobal.h"
 
 #include "maemoconstants.h"