summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-06-30 11:17:40 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-06-30 12:40:10 (GMT)
commit524c61de5238d58a4019a54001736d60c2daf1ce (patch)
tree708b766513a3aae26465d9ad1f780cd55c46a293 /qmake
parenteebed4698003518e0185f8012df6c4bf5364307b (diff)
downloadQt-524c61de5238d58a4019a54001736d60c2daf1ce.zip
Qt-524c61de5238d58a4019a54001736d60c2daf1ce.tar.gz
Qt-524c61de5238d58a4019a54001736d60c2daf1ce.tar.bz2
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
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/symbian/initprojectdeploy_symbian.cpp14
1 files changed, 14 insertions, 0 deletions
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();
+ }
+ }
}