diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-11 23:27:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-11 23:27:40 (GMT) |
| commit | 01245bcabf97dfdfdd23a2ec075b8de3e78bdeb2 (patch) | |
| tree | d6669a1239d2c90613fb23c848ad86842d990a2e /src/3rdparty | |
| parent | e3f342d60cb25a7c90f9401102c750e239a16e53 (diff) | |
| parent | 86d724590212825ba6db87da75117911880a30a8 (diff) | |
| download | Qt-01245bcabf97dfdfdd23a2ec075b8de3e78bdeb2.zip Qt-01245bcabf97dfdfdd23a2ec075b8de3e78bdeb2.tar.gz Qt-01245bcabf97dfdfdd23a2ec075b8de3e78bdeb2.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Revert WebCore.pro part of 2761e6f57ecd00c3435dbb8a6cf5f40653195d5d to build QtWebKit with THUMB again
QNAM HTTP: Optimize detectPipeliningSupport()
QNAM HTTP: Set channel to IdleState at better place
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index 7b0366d..c9b622a 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -26,9 +26,7 @@ symbian: { # 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 } include($$PWD/../WebKit.pri) |