diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-10-07 10:58:16 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-07 16:23:41 (GMT) |
| commit | 00db2d0b1f069a1e1a71b3f1175dfb0dff71cae1 (patch) | |
| tree | 23a7e80f5911b61af415faa0c188e7ef49565679 | |
| parent | 43fe0d1e73366f5b29930c0f9ddef959729dca66 (diff) | |
| download | Qt-00db2d0b1f069a1e1a71b3f1175dfb0dff71cae1.zip Qt-00db2d0b1f069a1e1a71b3f1175dfb0dff71cae1.tar.gz Qt-00db2d0b1f069a1e1a71b3f1175dfb0dff71cae1.tar.bz2 | |
2009-10-07 Janne Koskinen <janne.p.koskinen@digia.com>
Reviewed by Simon Hausmann.
[Qt] Symbian SBSv2 .data segment adress fix
https://bugs.webkit.org/show_bug.cgi?id=30157
RO-section in qtwebkit.dll exceeds allocated space in SBSv2. Move RW-section
base address to start from 0x800000 instead of the toolchain default 0x400000
* WebCore.pro:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49239 268f45cc-cd09-0410-ab3c-d52691b4dbfc
(cherry picked from commit d73ea9d00fec200b2dd6de5e4c8f298caffa4aca)
| -rw-r--r-- | src/3rdparty/webkit/WebCore/ChangeLog | 12 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 3 |
2 files changed, 15 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index aacc3dc..4f7dd4f 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,15 @@ +2009-10-07 Janne Koskinen <janne.p.koskinen@digia.com> + + Reviewed by Simon Hausmann. + + [Qt] Symbian SBSv2 .data segment adress fix + https://bugs.webkit.org/show_bug.cgi?id=30157 + + RO-section in qtwebkit.dll exceeds allocated space in SBSv2. Move RW-section + base address to start from 0x800000 instead of the toolchain default 0x400000 + + * WebCore.pro: + 2009-09-29 Dave Hyatt <hyatt@apple.com> Reviewed by Jon Honeycutt. diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index bc22b7a..1c39bb8 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -13,6 +13,9 @@ symbian: { TARGET.UID3 = 0x200267C2 } +# RO-section in qtwebkit.dll exceeds allocated space in SBSv2. Move RW-section +# base address to start from 0x800000 instead of the toolchain default 0x400000. +symbian-sbsv2: MMP_RULES += "LINKEROPTION armcc --rw-base 0x800000" include($$PWD/../WebKit.pri) |