[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[barraclough at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 53d794bfdf2d492e153510823a2522d188dfe711
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 10 03:18:52 2010 +0000

    Qt build fix attempt V.
    
    * dom/QualifiedName.cpp:
    (WebCore::QualifiedName::toString):
    * dom/XMLDocumentParserQt.cpp:
    (WebCore::handleElementNamespaces):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65041 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 30cffc3..e983f7c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,14 @@
 2010-08-09  Gavin Barraclough  <barraclough at apple.com>
 
+        Qt build fix attempt V.
+
+        * dom/QualifiedName.cpp:
+        (WebCore::QualifiedName::toString):
+        * dom/XMLDocumentParserQt.cpp:
+        (WebCore::handleElementNamespaces):
+
+2010-08-09  Gavin Barraclough  <barraclough at apple.com>
+
         Qt build fix attempt IV.
 
         * css/CSSSelector.cpp:
diff --git a/WebCore/dom/QualifiedName.cpp b/WebCore/dom/QualifiedName.cpp
index e0098f5..7c29ce0 100644
--- a/WebCore/dom/QualifiedName.cpp
+++ b/WebCore/dom/QualifiedName.cpp
@@ -89,7 +89,7 @@ String QualifiedName::toString() const
 {
     String local = localName();
     if (hasPrefix()) {
-        String result(prefix());
+        String result = prefix().string();
         result.append(":");
         result.append(local);
         return result;
diff --git a/WebCore/dom/XMLDocumentParserQt.cpp b/WebCore/dom/XMLDocumentParserQt.cpp
index 4a33d57..678d141 100644
--- a/WebCore/dom/XMLDocumentParserQt.cpp
+++ b/WebCore/dom/XMLDocumentParserQt.cpp
@@ -325,7 +325,7 @@ static inline void handleElementNamespaces(Element* newElement, const QXmlStream
     for (int i = 0; i < ns.count(); ++i) {
         const QXmlStreamNamespaceDeclaration &decl = ns[i];
         String namespaceURI = decl.namespaceUri();
-        String namespaceQName = decl.prefix().isEmpty() ? String("xmlns") : String("xmlns:")
+        String namespaceQName = decl.prefix().isEmpty() ? String("xmlns") : String("xmlns:");
         namespaceQName.append(decl.prefix());
         newElement->setAttributeNS("http://www.w3.org/2000/xmlns/", namespaceQName, namespaceURI, ec, scriptingPermission);
         if (ec) // exception setting attributes

-- 
WebKit Debian packaging