diff options
| author | axis <qt-info@nokia.com> | 2010-02-04 08:21:44 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-04 09:14:41 (GMT) |
| commit | 08581d2aa53fff9ff8625a484b9633753ba9b1a0 (patch) | |
| tree | 789732c7210f87ba614e5b24912921430883a0fe /src | |
| parent | b22525edc8c75c1aae34b10dc47d3dabf77e030d (diff) | |
| download | Qt-08581d2aa53fff9ff8625a484b9633753ba9b1a0.zip Qt-08581d2aa53fff9ff8625a484b9633753ba9b1a0.tar.gz Qt-08581d2aa53fff9ff8625a484b9633753ba9b1a0.tar.bz2 | |
Make webkit compile on linux+armcc
Based on a patch by Thomas Zander.
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index 04aba62..de185c1 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -23,9 +23,15 @@ symbian: { TARGET.UID3 = 0x200267C2 # 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 + 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 + } } include($$PWD/../WebKit.pri) |