diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-13 09:07:16 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-13 09:07:16 (GMT) |
| commit | 271c231bbc6a5376d557378c425e6c35299fb88b (patch) | |
| tree | 1ff81561c397285c6c2f7d57632f5d9a6ff81626 | |
| parent | 1a9037333214a898588d39fd2ae087bca5ff3b53 (diff) | |
| parent | 9abacb24b4e88e6811b90881d9e55764061607b2 (diff) | |
| download | Qt-271c231bbc6a5376d557378c425e6c35299fb88b.zip Qt-271c231bbc6a5376d557378c425e6c35299fb88b.tar.gz Qt-271c231bbc6a5376d557378c425e6c35299fb88b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Added --remove-destination to qmake_emulator_deployment.flm
| -rw-r--r-- | mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm | 2 |
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 |