Changeset 74978 in webkit

Timestamp:

Jan 4, 2011 11:16:38 AM (13 years ago)

Author:

Laszlo Gombos

Message:

2011-01-04 Laszlo Gombos <Laszlo Gombos>

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:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.pri (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-01-04  Laszlo Gombos  <laszlo.1.gombos@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@apple.com>
 

trunk/Source/JavaScriptCore/JavaScriptCore.pri

@@ -21 +21 @@
 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/.. \
@@ -50 +42 @@
     $$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