summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-10-13 08:42:57 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-10-13 08:50:39 (GMT)
commit9abacb24b4e88e6811b90881d9e55764061607b2 (patch)
tree1ff81561c397285c6c2f7d57632f5d9a6ff81626
parent7d21b598d299ee61d61f15c69b41b8b38daf9bea (diff)
downloadQt-9abacb24b4e88e6811b90881d9e55764061607b2.zip
Qt-9abacb24b4e88e6811b90881d9e55764061607b2.tar.gz
Qt-9abacb24b4e88e6811b90881d9e55764061607b2.tar.bz2
Added --remove-destination to qmake_emulator_deployment.flm
This will fix the issue with deploying files when destination is owned by another user. Reviewed-by: TrustMe
-rw-r--r--mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm
index 3877edb..a557cbb 100644
--- a/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm
+++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm
@@ -21,7 +21,7 @@ CLEAN_TARGET:=$(1)
$(1): $(2)
$(call startrule,qmake_emulator_deployment) \
- $(GNUCP) --no-preserve=mode $(2) "$$@" && \
+ $(GNUCP) --remove-destination --no-preserve=mode $(2) "$$@" && \
$(GNUCHMOD) a+rw "$$@" \
$(call endrule,qmake_emulator_deployment)
endef