[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
barraclough at apple.com
barraclough at apple.com
Wed Dec 22 11:51:58 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit d13fe9ccfff9e4f23706ef17340706c24a06e41b
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 10 03:34:14 2010 +0000
Qt build fix attempt VII.
* dom/QualifiedName.cpp:
(WebCore::QualifiedName::toString):
* dom/XMLDocumentParserQt.cpp:
(WebCore::handleElementNamespaces):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65045 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1c530cf..0c28994 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,14 @@
2010-08-09 Gavin Barraclough <barraclough at apple.com>
+ Qt build fix attempt VII.
+
+ * dom/QualifiedName.cpp:
+ (WebCore::QualifiedName::toString):
+ * dom/XMLDocumentParserQt.cpp:
+ (WebCore::handleElementNamespaces):
+
+2010-08-09 Gavin Barraclough <barraclough at apple.com>
+
Qt build fix attempt VI.
* dom/QualifiedName.cpp:
diff --git a/WebCore/loader/CrossOriginPreflightResultCache.cpp b/WebCore/loader/CrossOriginPreflightResultCache.cpp
index f0211af..3513e15 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 " + it->first + " is not allowed by Access-Control-Allow-Headers.";
+ errorDescription = "Request header field " + String(it->first) + " is not allowed by Access-Control-Allow-Headers.";
return false;
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list