summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-03-18 09:26:23 (GMT)
committeraxis <qt-info@nokia.com>2010-03-18 09:27:46 (GMT)
commitd7aa84d9f4ea9f34dfcdf4409508475a11015e9f (patch)
tree7b5ca8dc6d82a4b0c9de0efcfdbc39f4d7f01331 /src/3rdparty/webkit
parent6b90ce1abd8a16cecd11e56453019bb86f94b5fe (diff)
downloadQt-d7aa84d9f4ea9f34dfcdf4409508475a11015e9f.zip
Qt-d7aa84d9f4ea9f34dfcdf4409508475a11015e9f.tar.gz
Qt-d7aa84d9f4ea9f34dfcdf4409508475a11015e9f.tar.bz2
Fixed wrong qmake logic for Symbian.
Also remove a redundant line.
Diffstat (limited to 'src/3rdparty/webkit')
-rw-r--r--src/3rdparty/webkit/WebCore/WebCore.pro3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
index 2f3b490..a80eed4 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -24,12 +24,11 @@ symbian: {
DEPLOYMENT += webkitlibs webkitbackup
- symbian-abld:symbian-sbsv2 {
+ symbian-abld|symbian-sbsv2 {
# 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
CONFIG += do_not_build_as_thumb
- MMP_RULES += "LINKEROPTION armcc --rw-base 0xE00000"
}
}