summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-06-24 14:23:16 (GMT)
committeraxis <qt-info@nokia.com>2010-06-24 14:25:07 (GMT)
commit8d88f35f5f5c06277e2a54b6aea48b7f3e2e1c51 (patch)
treeb665daac6a833073dd27f82f4229da49152efa56
parent415eab3eab1a037badec279dbfd41278f0f92719 (diff)
downloadQt-8d88f35f5f5c06277e2a54b6aea48b7f3e2e1c51.zip
Qt-8d88f35f5f5c06277e2a54b6aea48b7f3e2e1c51.tar.gz
Qt-8d88f35f5f5c06277e2a54b6aea48b7f3e2e1c51.tar.bz2
Fixed incorrect parsing of TARGET.EPOCHEAPSIZE.
RevBy: Trust me
-rw-r--r--mkspecs/features/symbian/symbian_building.prf6
1 files changed, 4 insertions, 2 deletions
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf
index bdab8d5..08ab3e7 100644
--- a/mkspecs/features/symbian/symbian_building.prf
+++ b/mkspecs/features/symbian/symbian_building.prf
@@ -10,6 +10,8 @@
isEmpty(TARGET.EPOCSTACKSIZE):TARGET.EPOCSTACKSIZE = 0x14000
isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x020000 0x800000
+epoc_heap_size = $$split(TARGET.EPOCHEAPSIZE, " ")
+epoc_heap_size = $$join(epoc_heap_size, ",")
symbianObjdir=$$OBJECTS_DIR
isEmpty(symbianObjdir) {
@@ -118,7 +120,7 @@ contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib) {
--dso=$${symbianDestdir}/$${TARGET}.dso \
--defoutput=$$symbianObjdir/$${TARGET}.def \
--linkas=$${TARGET}\\{$${hexVersion}\\}\\[$${intUid3}\\].dll \
- --heap=$$join(TARGET.EPOCHEAPSIZE, ",") \
+ --heap=$$epoc_heap_size \
--stack=$$TARGET.EPOCSTACKSIZE \
$$elf2e32_LIBPATH \
$$capability \
@@ -164,7 +166,7 @@ contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@.*") {
--elfinput=$${symbianDestdir}/$${TARGET}.sym \
--output=$${symbianDestdir}/$${TARGET}.exe \
--linkas=$${TARGET}\\{$${hexVersion}\\}\\[$${intUid3}\\].exe \
- --heap=$$join(TARGET.EPOCHEAPSIZE, ",") \
+ --heap=$$epoc_heap_size \
--stack=$$TARGET.EPOCSTACKSIZE \
$$elf2e32_LIBPATH \
$$capability \