[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-142-g786665c
laszlo.1.gombos at nokia.com
laszlo.1.gombos at nokia.com
Mon Dec 27 16:29:24 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 260822ddf3916ae04c3a561c1d83aac1b678a4d2
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 22 05:40:36 2010 +0000
2010-12-21 Siddharth Mathur <siddharth.mathur at nokia.com>
Reviewed by Laszlo Gombos.
[Qt] [WK2] Guard gcc-specific syntax
* WebKit2.pro: Non-gcc based compliers choke on the "-include"
syntax for preinclude, make sure it has guard around it.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74460 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 649585f..97e0bb2 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-21 Siddharth Mathur <siddharth.mathur at nokia.com>
+
+ Reviewed by Laszlo Gombos.
+
+ [Qt] [WK2] Guard gcc-specific syntax
+
+ * WebKit2.pro: Non-gcc based compliers choke on the "-include"
+ syntax for preinclude, make sure it has guard around it.
+
2010-12-21 Anders Carlsson <andersca at apple.com>
Reviewed by Darin Adler.
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index c5c17f7..e0b8fba 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -159,7 +159,7 @@ INCLUDEPATH += \
PREFIX_HEADER = $$PWD/../WebKit2/WebKit2Prefix.h
-QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER"
+*-g++*:QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER"
WEBKIT2_GENERATED_HEADERS = \
$$WEBKIT2_GENERATED_SOURCES_DIR/AuthenticationManagerMessages.h \
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list