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

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit f9ba3328829d2221ade1c944cb99fd0c121120e7
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 30 14:35:02 2010 +0000

    2010-11-30  Thiago Macieira  <thiago.macieira at nokia.com>
    
            Reviewed by Andreas Kling.
    
            [Qt] QWebFrame::load(QNetworkRequest) should respect the CustomVerbAttribute
    
            For CustomOperation requests, pass the CustomVerbAttribute on to
            the WebCore::ResourceRequest.
    
            * Api/qwebframe.cpp:
            (QWebFrame::load):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72910 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index eb7a85f..3cdbef2 100644
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -837,6 +837,11 @@ void QWebFrame::load(const QNetworkRequest &req,
         case QNetworkAccessManager::DeleteOperation:
             request.setHTTPMethod("DELETE");
             break;
+#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
+        case QNetworkAccessManager::CustomOperation:
+            request.setHTTPMethod(req.attribute(QNetworkRequest::CustomVerbAttribute).toByteArray().constData());
+            break;
+#endif
         case QNetworkAccessManager::UnknownOperation:
             // eh?
             break;
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 5c54db2..92e299e 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-30  Thiago Macieira  <thiago.macieira at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] QWebFrame::load(QNetworkRequest) should respect the CustomVerbAttribute
+
+        For CustomOperation requests, pass the CustomVerbAttribute on to
+        the WebCore::ResourceRequest.
+
+        * Api/qwebframe.cpp:
+        (QWebFrame::load):
+
 2010-11-25  Norbert Leser  <norbert.leser at nokia.com>
 
         Reviewed by Laszlo Gombos.

-- 
WebKit Debian packaging