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

[laszlo.1.gombos at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 7cc88a7803e3c9224b070c9c7fd008d36f5fb0c1
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 17 18:22:45 2010 +0000

    2010-08-17  Hui Huang  <hui.2.huang at nokia.com>
    
            Reviewed by Laszlo Gombos.
    
            [Qt] Fix ARM5 compiling error in FrameLoaderClientQt.cpp
            https://bugs.webkit.org/show_bug.cgi?id=43927
    
            In the Symbian build chain QT_USE_FAST_OPERATOR_PLUS is defined,
            which means that the '+' will automatically be performed as the
            QStringBuilder '%'. Create a QString explicitly to make sure that
            toLocal8bit() member is available that the qPrintable Macro uses.
    
            * WebCoreSupport/FrameLoaderClientQt.cpp:
            (WebCore::FrameLoaderClientQt::dispatchDecidePolicyForNavigationAction):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65521 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index a7da741..fb1970e 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-17  Hui Huang  <hui.2.huang at nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] Fix ARM5 compiling error in FrameLoaderClientQt.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=43927
+
+        In the Symbian build chain QT_USE_FAST_OPERATOR_PLUS is defined,
+        which means that the '+' will automatically be performed as the
+        QStringBuilder '%'. Create a QString explicitly to make sure that
+        toLocal8bit() member is available that the qPrintable Macro uses.
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::dispatchDecidePolicyForNavigationAction):
+
 2010-08-16  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
 
         Reviewed by Kenneth Christiansen.
diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index cf76dae..1dd9f21 100644
--- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -1121,7 +1121,7 @@ void FrameLoaderClientQt::dispatchDecidePolicyForNavigationAction(FramePolicyFun
 
         printf("Policy delegate: attempt to load %s with navigation type '%s'%s\n",
                qPrintable(drtDescriptionSuitableForTestResult(request.url())), navigationTypeToString(action.type()),
-               (node) ? qPrintable(" originating from " + drtDescriptionSuitableForTestResult(node, 0)) : "");
+               (node) ? qPrintable(QString(" originating from " + drtDescriptionSuitableForTestResult(node, 0))) : "");
 
         if (policyDelegatePermissive)
             result = PolicyUse;

-- 
WebKit Debian packaging