Changeset 65877 in webkit

Timestamp:

Aug 24, 2010 1:51:39 AM (14 years ago)

Author:

Simon Hausmann

Message:

[Qt][Symbian] Make sure WebKit headers are included before platform headers on Symbian
​https://bugs.webkit.org/show_bug.cgi?id=31273

Patch by Laszlo Gombos <Laszlo Gombos> on 2010-08-24
Reviewed by Simon Hausmann.

On Symbian PREPEND_INCLUDEPATH is the best way to make sure that
WebKit headers are included before platform headers. On all other
platforms continue to use INCLUDEPATH (as before).

This patch also removed the workarounds that are put in place
now that we have a better solution.

No new tests as there is no new functionality.

• WebCore.pro:

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-24  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt][Symbian] Make sure WebKit headers are included before platform headers on Symbian
+        https://bugs.webkit.org/show_bug.cgi?id=31273
+
+        On Symbian PREPEND_INCLUDEPATH is the best way to make sure that
+        WebKit headers are included before platform headers. On all other
+        platforms continue to use INCLUDEPATH (as before).
+
+        This patch also removed the workarounds that are put in place 
+        now that we have a better solution.
+
+        No new tests as there is no new functionality.
+
+        * WebCore.pro:
+
 2010-08-24  Ariya Hidayat  <ariya@sencha.com>
 

trunk/WebCore/WebCore.pro

@@ -47 +47 @@
     DEPLOYMENT += webkitlibs webkitbackup
 
-    # Need to guarantee that these come before system includes of /epoc32/include
-    MMP_RULES += "USERINCLUDE bridge"
-    MMP_RULES += "USERINCLUDE platform/animation"
-    MMP_RULES += "USERINCLUDE platform/text"
-    MMP_RULES += "USERINCLUDE rendering"
     symbian-abld|symbian-sbsv2 {
         # RO text (code) section in qtwebkit.dll exceeds allocated space for gcce udeb target.
@@ -184 +179 @@
 include(WebCore.pri)
 
-INCLUDEPATH = \
+WEBCORE_INCLUDEPATH = \
     $$PWD \
     $$PWD/accessibility \
@@ -232 +227 @@
     $$PWD/workers \
     $$PWD/xml \
-    $$WC_GENERATED_SOURCES_DIR \
-    $$INCLUDEPATH
-
-INCLUDEPATH = \
+    $$WC_GENERATED_SOURCES_DIR
+
+WEBCORE_INCLUDEPATH = \
     $$PWD/bridge/qt \
     $$PWD/page/qt \
@@ -243 +237 @@
     $$PWD/../WebKit/qt/Api \
     $$PWD/../WebKit/qt/WebCoreSupport \
-    $$INCLUDEPATH
+    $$WEBCORE_INCLUDEPATH
+
+symbian {
+    PREPEND_INCLUDEPATH = $$WEBCORE_INCLUDEPATH $$PREPEND_INCLUDEPATH
+} else {
+    INCLUDEPATH = $$WEBCORE_INCLUDEPATH $$INCLUDEPATH
+}
 
 QT += network