From e55c346f039e8d4577caf4a1ee5c36fe60a35385 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@nokia.com>
Date: Fri, 30 Jul 2010 19:50:41 +0200
Subject: [PATCH] Clean up the deployment part (a bit)
---
src/plugins/qmlprojectmanager/wizards/templates/app.pro | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/plugins/qmlprojectmanager/wizards/templates/app.pro b/src/plugins/qmlprojectmanager/wizards/templates/app.pro
index 08c9e729172..c22d2afc2c9 100644
--- a/src/plugins/qmlprojectmanager/wizards/templates/app.pro
+++ b/src/plugins/qmlprojectmanager/wizards/templates/app.pro
@@ -47,9 +47,8 @@ symbian {
copyCommand = @echo Copying application data...
for(deploymentfolder, DEPLOYMENTFOLDERS) {
source = $$eval($${deploymentfolder}.source)
- target = $$eval($${deploymentfolder}.target)
pathSegments = $$split(source, /)
- sourceAndTarget = $$PWD/$$source $$OUT_PWD/$$target/$$last(pathSegments)
+ sourceAndTarget = $$PWD/$$source $$OUT_PWD/$$eval($${deploymentfolder}.target)/$$last(pathSegments)
copyCommand += && $(COPY_DIR) $$replace(sourceAndTarget, /, \\)
}
copydeploymentfolders.commands = $$copyCommand
@@ -80,10 +79,9 @@ symbian {
!isEqual(PWD,$$OUT_PWD) {
copyCommand = @echo Copying application data...
for(deploymentfolder, DEPLOYMENTFOLDERS) {
- source = $$eval($${deploymentfolder}.source)
- target = $$OUT_PWD/$$eval($${deploymentfolder}.target)/$$last(pathSegments)
+ target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
copyCommand += && $(MKDIR) $$target
- copyCommand += && $(COPY_DIR) $$PWD/$$source $$target
+ copyCommand += && $(COPY_DIR) $$PWD/$$eval($${deploymentfolder}.source) $$target
}
copydeploymentfolders.commands = $$copyCommand
first.depends = $(first) copydeploymentfolders
--
GitLab