summaryrefslogtreecommitdiffstats
path: root/mkspecs/common/symbian/symbian.conf
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-11-05 14:45:39 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-11-08 09:51:37 (GMT)
commit70770a2e4fc7581f56a39f7b8b89dd5782cd29c0 (patch)
tree144770f9ffa940b46648c9f47f52b790bd390639 /mkspecs/common/symbian/symbian.conf
parente8b10f2239a15e8d0ad1b676b7f03d03543efc67 (diff)
downloadQt-70770a2e4fc7581f56a39f7b8b89dd5782cd29c0.zip
Qt-70770a2e4fc7581f56a39f7b8b89dd5782cd29c0.tar.gz
Qt-70770a2e4fc7581f56a39f7b8b89dd5782cd29c0.tar.bz2
Make default application deployment removable
Default application deployment was hard coded in qmake, so it was impossible to replace with custom deployment. Now the default deployment is generated via .prf files and is removable. Cherry picked to 4.7 branch from master branch as part of QTBUG-15068, original commit: 494ce0dac35c7ade0ce78589878597a7ca912864 Task-number: QTBUG-15068 Task-number: QTBUG-13367 Reviewed-by: axis Conflicts: qmake/generators/symbian/symbiancommon.cpp
Diffstat (limited to 'mkspecs/common/symbian/symbian.conf')
-rw-r--r--mkspecs/common/symbian/symbian.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index decec14..2fb799d 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -202,7 +202,7 @@ pkg_platform_dependencies = \
"[0x20032DE7],0,0,0,{\"S60ProductID\"}" \
" "
-DEPLOYMENT += default_deployment
+DEPLOYMENT += default_deployment default_bin_deployment default_resource_deployment default_reg_deployment
defineReplace(symbianRemoveSpecialCharacters) {
# Produce identical string to what SymbianCommonGenerator::removeSpecialCharacters and