diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-02-22 08:21:49 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-02-23 20:03:46 (GMT) |
| commit | 0f20bdc28458b147cb177b1d45dc06a75ab3b7b9 (patch) | |
| tree | cc66ee4f3c8fe2c50fb14cd8817811832ef758da /src/3rdparty | |
| parent | 35da749cba87e4e08a630bd359403fde8f266f0d (diff) | |
| download | Qt-0f20bdc28458b147cb177b1d45dc06a75ab3b7b9.zip Qt-0f20bdc28458b147cb177b1d45dc06a75ab3b7b9.tar.gz Qt-0f20bdc28458b147cb177b1d45dc06a75ab3b7b9.tar.bz2 | |
Fix compilation on Windows
For some reason, the MSVC compiler choose the
operator+(const QString &, const QString &) instead of
operator+(const WebCore::String &, const WebCore::String &)
resulting in errors when QT_USE_FAST_OPERATOR_PLUS is used
Reviewed-by: Jocelyn Turcotte
(cherry picked from commit 1ecfec9950fb66378035f92be8c8b13b1b891872)
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/dom/XMLTokenizerQt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/dom/XMLTokenizerQt.cpp b/src/3rdparty/webkit/WebCore/dom/XMLTokenizerQt.cpp index 5335b07..8ff8d6b 100644 --- a/src/3rdparty/webkit/WebCore/dom/XMLTokenizerQt.cpp +++ b/src/3rdparty/webkit/WebCore/dom/XMLTokenizerQt.cpp @@ -329,7 +329,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:") + decl.prefix(); + String namespaceQName = decl.prefix().isEmpty() ? String("xmlns") : String("xmlns:") + String(decl.prefix()); newElement->setAttributeNS("http://www.w3.org/2000/xmlns/", namespaceQName, namespaceURI, ec, scriptingPermission); if (ec) // exception setting attributes return; |