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

[mrowe at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 0e87cf1b54b319abb3e80fbfdda6a4ffe08c8e87
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 15 00:19:40 2010 +0000

    Fix the Qt build.
    
    * xml/XSLTProcessorQt.cpp:
    (WebCore::XSLTProcessor::transformToString): Make the conversion to QString explicit
    since QVariant can be constructed from either a QString or a bool.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74068 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index df7471d..412e1d2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-12-14  Mark Rowe  <mrowe at apple.com>
+
+        Fix the Qt build.
+
+        * xml/XSLTProcessorQt.cpp:
+        (WebCore::XSLTProcessor::transformToString): Make the conversion to QString explicit
+        since QVariant can be constructed from either a QString or a bool.
+
 2010-12-14  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/xml/XSLTProcessorQt.cpp b/WebCore/xml/XSLTProcessorQt.cpp
index 3a5df22..717ad8b 100644
--- a/WebCore/xml/XSLTProcessorQt.cpp
+++ b/WebCore/xml/XSLTProcessorQt.cpp
@@ -141,7 +141,7 @@ bool XSLTProcessor::transformToString(Node* sourceNode, String&, String& resultS
 
     XSLTProcessor::ParameterMap::iterator end = m_parameters.end();
     for (XSLTProcessor::ParameterMap::iterator it = m_parameters.begin(); it != end; ++it)
-        query.bindVariable(QString(it->first), QXmlItem(QVariant(it->second)));
+        query.bindVariable(QString(it->first), QXmlItem(QVariant(QString(it->second))));
 
     QString source;
     if (sourceIsDocument && ownerDocument->transformSource())

-- 
WebKit Debian packaging