[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[hausmann at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit b8b1789354faa93b3fc11be2f5c02733c99990e5
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 24 08:51:39 2010 +0000

    [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.1.gombos at nokia.com> 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:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65877 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cc176f0..2ac7e71 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2010-08-24  Laszlo Gombos  <laszlo.1.gombos at 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 at sencha.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 3aa750f..ffc679a 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -46,11 +46,6 @@ symbian: {
 
     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.
         # Move RW-section base address to start from 0xE00000 instead of the toolchain default 0x400000.
@@ -183,7 +178,7 @@ defineTest(addExtraCompiler) {
 }
 include(WebCore.pri)
 
-INCLUDEPATH = \
+WEBCORE_INCLUDEPATH = \
     $$PWD \
     $$PWD/accessibility \
     $$PWD/bindings \
@@ -231,10 +226,9 @@ INCLUDEPATH = \
     $$PWD/wml \
     $$PWD/workers \
     $$PWD/xml \
-    $$WC_GENERATED_SOURCES_DIR \
-    $$INCLUDEPATH
+    $$WC_GENERATED_SOURCES_DIR
 
-INCLUDEPATH = \
+WEBCORE_INCLUDEPATH = \
     $$PWD/bridge/qt \
     $$PWD/page/qt \
     $$PWD/platform/graphics/qt \
@@ -242,7 +236,13 @@ INCLUDEPATH = \
     $$PWD/platform/qt \
     $$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
 

-- 
WebKit Debian packaging