diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-04-15 14:08:55 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-04-16 12:04:41 (GMT) |
| commit | 0c92a94950a45474029c76f470e3db3cc0a4b9fc (patch) | |
| tree | b6db2dceb9a0afbc5e3c823ebe75028a2efeb834 | |
| parent | ab54d7897969ce1ea40e1ff6155022995fe284fc (diff) | |
| download | Qt-0c92a94950a45474029c76f470e3db3cc0a4b9fc.zip Qt-0c92a94950a45474029c76f470e3db3cc0a4b9fc.tar.gz Qt-0c92a94950a45474029c76f470e3db3cc0a4b9fc.tar.bz2 | |
Webkit got bigger, make it link again on armlink
| -rw-r--r-- | mkspecs/symbian/linux-armcc/qmake.conf | 1 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/mkspecs/symbian/linux-armcc/qmake.conf b/mkspecs/symbian/linux-armcc/qmake.conf index 6042fa4..599e552 100644 --- a/mkspecs/symbian/linux-armcc/qmake.conf +++ b/mkspecs/symbian/linux-armcc/qmake.conf @@ -29,6 +29,7 @@ QMAKE_QtGui_LFLAGS = "--rw-base 0x800000" #QMAKE_QtTest_CXXFLAGS = #QMAKE_QtXmlPatterns_CXXFLAGS = #QMAKE_QtXml_CXXFLAGS = +QMAKE_QtWebKit_CXXFLAGS = --arm # Move RW-section base address to start from 0xE00000 instead of the toolchain default 0x400000. QMAKE_QtWebKit_LFLAGS = --rw-base 0xE00000 diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index bdb3f83..653781c 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -35,10 +35,13 @@ symbian: { # Move RW-section base address to start from 0xE00000 instead of the toolchain default 0x400000. QMAKE_LFLAGS.ARMCC += --rw-base 0xE00000 MMP_RULES += ALWAYS_BUILD_AS_ARM + } else { + QMAKE_CFLAGS -= --thumb + QMAKE_CXXFLAGS -= --thumb } - CONFIG(release, debug|release): QMAKE_CXXFLAGS.ARMCC += -OTime -O3 } + isEmpty(OUTPUT_DIR): OUTPUT_DIR = .. include($$PWD/../WebKit.pri) |