summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Zander <t.zander@nokia.com>2010-03-17 10:59:54 (GMT)
committerThomas Zander <t.zander@nokia.com>2010-03-17 11:01:20 (GMT)
commitad4f9cbd52310bf5624e8504c4df22255399b99e (patch)
tree27585d44e0ffb2c5ec2f2631f24fb09ef18ec8d1
parentf0c615651fabb3e15469ab1eee3b4765dc1274d3 (diff)
downloadQt-ad4f9cbd52310bf5624e8504c4df22255399b99e.zip
Qt-ad4f9cbd52310bf5624e8504c4df22255399b99e.tar.gz
Qt-ad4f9cbd52310bf5624e8504c4df22255399b99e.tar.bz2
This should likely get webkit linking again on windows/sbsv2
Reinstate the MMP rule as this block is for sbsv2 only anyway
-rw-r--r--src/3rdparty/webkit/WebCore/WebCore.pro1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
index 2095179..2f3b490 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -29,6 +29,7 @@ symbian: {
# 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"
}
}