[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[laszlo.1.gombos at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 0517bbfe95d8ae6c71147d9eb3b2c03ea6504e25
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 4 19:16:38 2011 +0000

    2011-01-04  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Ariya Hidayat.
    
            [Qt][Symbian] Make sure that 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 is a continuation of r65877.
    
            No new tests as there is no new functionality.
    
            * JavaScriptCore.pri:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74978 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 29e8e84..f655c8d 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,18 @@
+2011-01-04  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Ariya Hidayat.
+
+        [Qt][Symbian] Make sure that 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 is a continuation of r65877.
+
+        No new tests as there is no new functionality.
+
+        * JavaScriptCore.pri:
+
 2011-01-04  Darin Adler  <darin at apple.com>
 
         Try to fix Windows build.
diff --git a/Source/JavaScriptCore/JavaScriptCore.pri b/Source/JavaScriptCore/JavaScriptCore.pri
index f49953b..222f664 100644
--- a/Source/JavaScriptCore/JavaScriptCore.pri
+++ b/Source/JavaScriptCore/JavaScriptCore.pri
@@ -20,15 +20,7 @@ CONFIG(standalone_package) {
 
 CONFIG(standalone_package): DEFINES *= NDEBUG
 
-symbian: {
-    # Need to guarantee this comes before system includes of /epoc32/include
-    MMP_RULES += "USERINCLUDE ../JavaScriptCore/profiler"
-    LIBS += -lhal
-    # For hal.h
-    INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE
-}
-
-INCLUDEPATH = \
+JAVASCRIPTCORE_INCLUDEPATH = \
     $$PWD \
     $$PWD/.. \
     $$PWD/../.. \ # FIXME: Remove this include once we finish moving the source to Source
@@ -49,8 +41,19 @@ INCLUDEPATH = \
     $$PWD/yarr \
     $$PWD/API \
     $$PWD/ForwardingHeaders \
-    $$JSC_GENERATED_SOURCES_DIR \
-    $$INCLUDEPATH
+    $$JSC_GENERATED_SOURCES_DIR
+
+symbian {
+    PREPEND_INCLUDEPATH = $$JAVASCRIPTCORE_INCLUDEPATH $$PREPEND_INCLUDEPATH
+} else {
+    INCLUDEPATH = $$JAVASCRIPTCORE_INCLUDEPATH $$INCLUDEPATH
+}
+
+symbian: {
+    LIBS += -lhal
+    # For hal.h
+    INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE
+}
 
 win32-*: DEFINES += _HAS_TR1=0
 

-- 
WebKit Debian packaging