diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-04-07 11:58:46 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2011-04-07 11:58:46 (GMT) |
| commit | a29a5862b32e36735f7014c8fc9083823bd3fbaa (patch) | |
| tree | 46ef09beef9f402a566fea5a6b7fb4d6b0c8c5b5 | |
| parent | 3a8006907634e5d4c02822d5ce14d558dee8b930 (diff) | |
| download | Qt-a29a5862b32e36735f7014c8fc9083823bd3fbaa.zip Qt-a29a5862b32e36735f7014c8fc9083823bd3fbaa.tar.gz Qt-a29a5862b32e36735f7014c8fc9083823bd3fbaa.tar.bz2 | |
Enable webkit build for the makefile build system with gcce
Task-number: QTBUG-18484
Task-number: WEBKIT-57841
Reviewed-by: axis
Reviewed-by: Janne Koskinen
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/wtf/MathExtras.h | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 17 |
2 files changed, 9 insertions, 10 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/MathExtras.h b/src/3rdparty/webkit/JavaScriptCore/wtf/MathExtras.h index f8bace4..9349b48 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/MathExtras.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/MathExtras.h @@ -190,7 +190,7 @@ inline float deg2turn(float d) { return d / 360.0f; } inline float rad2grad(float r) { return r * 200.0f / piFloat; } inline float grad2rad(float g) { return g * piFloat / 200.0f; } -#if !COMPILER(MSVC) && !COMPILER(RVCT) && !OS(ANDROID) && !COMPILER(WINSCW) +#if !COMPILER(MSVC) && !OS(ANDROID) && !OS(SYMBIAN) using std::isfinite; using std::isinf; using std::isnan; diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index 37d216d..c70a168 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -37,15 +37,14 @@ symbian: { # Need to guarantee that these come before system includes of /epoc32/include MMP_RULES += "USERINCLUDE rendering" MMP_RULES += "USERINCLUDE platform/text" - symbian-abld|symbian-sbsv2 { - # 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. - QMAKE_LFLAGS.ARMCC += --rw-base 0xE00000 - MMP_RULES += ALWAYS_BUILD_AS_ARM - } else { - QMAKE_CFLAGS -= --thumb - QMAKE_CXXFLAGS -= --thumb - } + + # 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. + QMAKE_LFLAGS.ARMCC += --rw-base 0xE00000 + QMAKE_LFLAGS.GCCE += -Tdata 0x1000000 + + CONFIG += do_not_build_as_thumb + CONFIG(release, debug|release): QMAKE_CXXFLAGS.ARMCC += -OTime -O3 } |