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

laszlo.1.gombos at nokia.com laszlo.1.gombos at nokia.com
Fri Jan 21 15:14:26 UTC 2011


The following commit has been merged in the debian/experimental branch:
commit fab1cec8970bf86372fe489102d732752ef37bba
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 10 15:30:17 2011 +0000

    2011-01-10  Siddharth Mathur <siddharth.mathur at nokia.com>
    
            Reviewed by Laszlo Gombos.
    
            [Qt][WK2] Guard gcc-specific syntax
    
            Non-gcc based compliers choke on the "-include"
            syntax for preinclude, place guard around it.
    
            * WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro:
            * WebKitTestRunner/qt/WebKitTestRunner.pro:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75374 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 33fc572..b295783 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-10  Siddharth Mathur <siddharth.mathur at nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt][WK2] Guard gcc-specific syntax
+
+        Non-gcc based compliers choke on the "-include"
+        syntax for preinclude, place guard around it.
+
+        * WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro:
+        * WebKitTestRunner/qt/WebKitTestRunner.pro:
+
 2011-01-10  Andreas Kling  <kling at webkit.org>
 
         Reviewed by Simon Hausmann.
diff --git a/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro b/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro
index c15d1f2..bdbed6f 100644
--- a/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro
+++ b/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro
@@ -65,7 +65,7 @@ INCLUDEPATH += \
     $$WC_GENERATED_SOURCES_DIR
 
 PREFIX_HEADER = $$PWD/../../WebKitTestRunnerPrefix.h
-QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER"
+*-g++*:QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER"
 
 unix:!mac:!symbian {
     CONFIG += link_pkgconfig
diff --git a/Tools/WebKitTestRunner/qt/WebKitTestRunner.pro b/Tools/WebKitTestRunner/qt/WebKitTestRunner.pro
index bcfc159..be1f0eb 100644
--- a/Tools/WebKitTestRunner/qt/WebKitTestRunner.pro
+++ b/Tools/WebKitTestRunner/qt/WebKitTestRunner.pro
@@ -52,7 +52,7 @@ SOURCES = \
     $$BASEDIR/TestInvocation.cpp \
 
 PREFIX_HEADER = $$BASEDIR/WebKitTestRunnerPrefix.h
-QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER"
+*-g++*:QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER"
 
 linux-* {
     # From Creator's src/rpath.pri:

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list