[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit ff9e991cd86068997dc5380ed3baf3a3614afbc2
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 17 17:57:17 2009 +0000

    [Qt] Symbian build fix: Don't include QtXml/qxmlstream.h but omit the prefix, to
    make sure we pick up the header file from QtCore. That is where the implementation
    is compiled.
    
    Reviewed by Tor Arne Vestbø.
    
    * dom/XMLTokenizer.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52259 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 62d82c0..9389623 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-17  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] Symbian build fix: Don't include QtXml/qxmlstream.h but omit the prefix, to
+        make sure we pick up the header file from QtCore. That is where the implementation
+        is compiled.
+
+        * dom/XMLTokenizer.h:
+
 2009-12-17  Martin Robinson  <martin.james.robinson at gmail.com>
 
         Reviewed by Gustavo Noronha Silva.
diff --git a/WebCore/dom/XMLTokenizer.h b/WebCore/dom/XMLTokenizer.h
index 2d6fefc..3bd15c8 100644
--- a/WebCore/dom/XMLTokenizer.h
+++ b/WebCore/dom/XMLTokenizer.h
@@ -34,7 +34,7 @@
 #include <wtf/OwnPtr.h>
 
 #if USE(QXMLSTREAM)
-#include <QtXml/qxmlstream.h>
+#include <qxmlstream.h>
 #else
 #include <libxml/tree.h>
 #include <libxml/xmlstring.h>

-- 
WebKit Debian packaging