summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2010-02-11 14:51:47 +0100
committerJason McDonald <jason.mcdonald@nokia.com>2010-02-12 01:42:46 +1000
commit244b440f11a519bbd0f6a2c5cde90edb1732f2ea (patch)
tree97d92675853a8e83492efefc045b2e3307f33cd1
parent77e67146b8b2555320f395f65ecba9013a169a7e (diff)
Revert WebCore.pro part of 2761e6f57ecd00c3435dbb8a6cf5f40653195d5d to build QtWebKit with THUMB againv4.6.2
This restores the library size and memory consumption. Reviewed-by: Janne Koskinen Reviewed-by: Iain (cherry picked from commit 86d724590212825ba6db87da75117911880a30a8)
-rw-r--r--src/3rdparty/webkit/WebCore/WebCore.pro4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
index 7b0366d0f3..c9b622a63c 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -26,9 +26,7 @@ symbian: {
# RO text (code) section in qtwebkit.dll exceeds allocated space for gcce udeb target.
# Move RW-section base address to start from 0xE00000 instead of the toolchain default 0x400000.
- MMP_RULES += "LINKEROPTION armcc --rw-base 0xE00000"
- MMP_RULES += ALWAYS_BUILD_AS_ARM
- QMAKE_CXXFLAGS.ARMCC += -OTime -O3
+ QMAKE_LFLAGS.ARMCC += --rw-base 0xE00000
}
include($$PWD/../WebKit.pri)