summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebCore
diff options
context:
space:
mode:
authorThomas Zander <t.zander@nokia.com>2010-02-09 13:38:29 (GMT)
committerThomas Zander <t.zander@nokia.com>2010-02-09 13:38:29 (GMT)
commit3cc5feeadf81b8e6d7dc6efddd751e9471888078 (patch)
tree98880cfe9c930b74f7a248e59a8c2979abbd2848 /src/3rdparty/webkit/WebCore
parent86fd3005d79de01dca5b857988bdf2a1411e74ee (diff)
downloadQt-3cc5feeadf81b8e6d7dc6efddd751e9471888078.zip
Qt-3cc5feeadf81b8e6d7dc6efddd751e9471888078.tar.gz
Qt-3cc5feeadf81b8e6d7dc6efddd751e9471888078.tar.bz2
Move duplicated code out to a qmake feature
Diffstat (limited to 'src/3rdparty/webkit/WebCore')
-rw-r--r--src/3rdparty/webkit/WebCore/WebCore.pro9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
index de185c1..7f2a17d 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -24,14 +24,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.
QMAKE_LFLAGS.ARMCC += --rw-base 0xE00000
- symbian-abld|symbian-sbsv2 {
- MMP_RULES += ALWAYS_BUILD_AS_ARM
- } else:linux-armcc {
- QMAKE_CFLAGS -= --thumb
- QMAKE_CFLAGS += --arm
- QMAKE_CXXFLAGS -= --thumb
- QMAKE_CXXFLAGS += --arm
- }
+ CONFIG += do_not_build_as_thumb
}
include($$PWD/../WebKit.pri)