From 08581d2aa53fff9ff8625a484b9633753ba9b1a0 Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Thu, 4 Feb 2010 09:21:44 +0100
Subject: Make webkit compile on linux+armcc

Based on a patch by Thomas Zander.
---
 src/3rdparty/webkit/WebCore/WebCore.pro | 12 +++++++++---
 1 file 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)
-- 
cgit v0.12