summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2010-02-11 13:51:47 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2010-02-11 13:54:33 (GMT)
commit86d724590212825ba6db87da75117911880a30a8 (patch)
tree76014e6fc41d43f189dc0ef3ea11f08dda4f7b99
parent439626ffafae7d0480e66a6795df647fd32bbc64 (diff)
downloadQt-86d724590212825ba6db87da75117911880a30a8.zip
Qt-86d724590212825ba6db87da75117911880a30a8.tar.gz
Qt-86d724590212825ba6db87da75117911880a30a8.tar.bz2
Revert WebCore.pro part of 2761e6f57ecd00c3435dbb8a6cf5f40653195d5d to build QtWebKit with THUMB again
This restores the library size and memory consumption. Reviewed-by: Janne Koskinen Reviewed-by: Iain
-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 7b0366d..c9b622a 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)