[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit ed6f1e1c1f6de520228813532805cc949255116e
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 21 16:05:57 2010 +0000

    [Qt] Fix incorrect dependency to QtXmlPatterns in generated include/QtWebKit/QtWebKit header
    
    Patch by Thiago Macieira <thiago.macieira at nokia.com> on 2010-01-21
    Reviewed by Simon Hausmann.
    
    The generated file includes QtXmlPatterns/QtXmlPatterns, which is neither used/required by
    the public QtWebKit API nor will it be available if Qt is configured with -no-xmlpatterns.
    
    * WebCore.pro: Trick syncqt to believe that xmlpatterns is not a dependency, so that it's not
    included in the generated file. It'll still be used and linked to with this trick.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53627 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 647802b..eadc3dc 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-21  Thiago Macieira  <thiago.macieira at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Fix incorrect dependency to QtXmlPatterns in generated include/QtWebKit/QtWebKit header
+
+        The generated file includes QtXmlPatterns/QtXmlPatterns, which is neither used/required by
+        the public QtWebKit API nor will it be available if Qt is configured with -no-xmlpatterns.
+
+        * WebCore.pro: Trick syncqt to believe that xmlpatterns is not a dependency, so that it's not
+        included in the generated file. It'll still be used and linked to with this trick.
+
 2010-01-21  Steve Block  <steveblock at google.com>
 
         Unreviewed build fix.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index df7bc31..1a919b9 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2328,7 +2328,7 @@ contains(DEFINES, ENABLE_XPATH=1) {
 unix:!mac:CONFIG += link_pkgconfig
 
 contains(DEFINES, ENABLE_XSLT=1) {
-    QT += xmlpatterns
+    tobe|!tobe: QT += xmlpatterns
 
     SOURCES += \
         bindings/js/JSXSLTProcessorConstructor.cpp \

-- 
WebKit Debian packaging