[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 17d300cb3f291785e72a9908711f3aae7b36c0c7
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 10 03:43:53 2010 +0000

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0c28994..3ca240b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,14 @@
 2010-08-09  Gavin Barraclough  <barraclough at apple.com>
 
+        Qt build fix attempt VIII.
+
+        * dom/QualifiedName.cpp:
+        (WebCore::QualifiedName::toString):
+        * dom/XMLDocumentParserQt.cpp:
+        (WebCore::handleElementNamespaces):
+
+2010-08-09  Gavin Barraclough  <barraclough at apple.com>
+
         Qt build fix attempt VII.
 
         * dom/QualifiedName.cpp:
diff --git a/WebCore/loader/CrossOriginPreflightResultCache.cpp b/WebCore/loader/CrossOriginPreflightResultCache.cpp
index 3513e15..51874d1 100644
--- a/WebCore/loader/CrossOriginPreflightResultCache.cpp
+++ b/WebCore/loader/CrossOriginPreflightResultCache.cpp
@@ -128,7 +128,7 @@ bool CrossOriginPreflightResultCacheItem::allowsCrossOriginHeaders(const HTTPHea
     HTTPHeaderMap::const_iterator end = requestHeaders.end();
     for (HTTPHeaderMap::const_iterator it = requestHeaders.begin(); it != end; ++it) {
         if (!m_headers.contains(it->first) && !isOnAccessControlSimpleRequestHeaderWhitelist(it->first, it->second)) {
-            errorDescription = "Request header field " + String(it->first) + " is not allowed by Access-Control-Allow-Headers.";
+            errorDescription = "Request header field " + it->first.string() + " is not allowed by Access-Control-Allow-Headers.";
             return false;
         }
     }

-- 
WebKit Debian packaging