Changeset 56715 in webkit

Timestamp:

Mar 29, 2010 4:14:27 AM (14 years ago)

Author:

Simon Hausmann

Message:

[Qt] Make it possible to build using both Windows and Linux for Symbian
​https://bugs.webkit.org/show_bug.cgi?id=36748

Patch by Thomas Zander <​t.zander@nokia.com> on 2010-03-29
Reviewed by Simon Hausmann.

• WebCore.pro: don't assume Windows buildsystem is the only one

and exclude the windows-only setters from the linux builds.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.pro (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-29  Thomas Zander  <t.zander@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Make it possible to build using both Windows and Linux for Symbian
+        https://bugs.webkit.org/show_bug.cgi?id=36748
+
+        * WebCore.pro: don't assume Windows buildsystem is the only one
+        and exclude the windows-only setters from the linux builds.
+
 2010-03-29  Thomas Zander  <t.zander@nokia.com>
 

trunk/WebCore/WebCore.pro

@@ -31 +31 @@
     MMP_RULES += "USERINCLUDE rendering"
     MMP_RULES += "USERINCLUDE platform/text"
-    # 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
+    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
+    }
     CONFIG(release, debug|release): QMAKE_CXXFLAGS.ARMCC += -OTime -O3
 }