From 524c61de5238d58a4019a54001736d60c2daf1ce Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Wed, 30 Jun 2010 14:17:40 +0300
Subject: Fixed pre-built resources deployment in Symbian

Pre-built resources didn't get properly copied under \epoc32\data\z.

Task-number: QTBUG-11519
Reviewed-by: Janne Koskinen
---
 qmake/generators/symbian/initprojectdeploy_symbian.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/qmake/generators/symbian/initprojectdeploy_symbian.cpp b/qmake/generators/symbian/initprojectdeploy_symbian.cpp
index 2750ecb..382e012 100644
--- a/qmake/generators/symbian/initprojectdeploy_symbian.cpp
+++ b/qmake/generators/symbian/initprojectdeploy_symbian.cpp
@@ -198,6 +198,7 @@ void initProjectDeploySymbian(QMakeProject* project,
             devicePathWithoutDrive.remove(0,2);
         }
         if (!deployBinaries
+                && 0 != platform.compare(QLatin1String(ROM_DEPLOYMENT_PLATFORM))
                 && !devicePathWithoutDrive.isEmpty()
                 && (0 == devicePathWithoutDrive.compare(project->values("APP_RESOURCE_DIR").join(""), Qt::CaseInsensitive)
                     || 0 == devicePathWithoutDrive.compare(project->values("REG_RESOURCE_IMPORT_DIR").join(""), Qt::CaseInsensitive))) {
@@ -343,4 +344,17 @@ void initProjectDeploySymbian(QMakeProject* project,
             }
         }
     }
+
+    // Remove deployments that do not actually do anything
+    if (0 == platform.compare(QLatin1String(EMULATOR_DEPLOYMENT_PLATFORM))
+        || 0 == platform.compare(QLatin1String(ROM_DEPLOYMENT_PLATFORM))) {
+        QMutableListIterator<CopyItem> i(deploymentList);
+        while(i.hasNext()) {
+            CopyItem &item = i.next();
+            QFileInfo fromItem(item.from);
+            QFileInfo toItem(item.to);
+            if (fromItem == toItem)
+                i.remove();
+        }
+    }
 }
-- 
cgit v0.12