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

[jocelyn.turcotte at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit e825e0226ea400e2670d1efe1f2e49409f0414a0
Author: jocelyn.turcotte at nokia.com <jocelyn.turcotte at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 10 14:48:41 2010 +0000

    [Qt] Second attempt to fix the build with Qt 4.6 broken in 73710.
    
    Reviewed by nobody, build fix.
    
    * platform/network/qt/QtNAMThreadSafeProxy.cpp:
    (WebCore::QtNetworkReplyThreadSafeProxy::QtNetworkReplyThreadSafeProxy):
    (WebCore::QtNetworkReplyThreadSafeProxy::localCustomRequest):
    * platform/network/qt/QtNAMThreadSafeProxy.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73722 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cc88e4b..610c72a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,17 @@
 
         Reviewed by nobody, build fix.
 
+        [Qt] Second attempt to fix the build with Qt 4.6 broken in 73710.
+
+        * platform/network/qt/QtNAMThreadSafeProxy.cpp:
+        (WebCore::QtNetworkReplyThreadSafeProxy::QtNetworkReplyThreadSafeProxy):
+        (WebCore::QtNetworkReplyThreadSafeProxy::localCustomRequest):
+        * platform/network/qt/QtNAMThreadSafeProxy.h:
+
+2010-12-10  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by nobody, build fix.
+
         [Qt] Fix the build with Qt 4.6 broken in 73710.
 
         * platform/network/qt/QtNAMThreadSafeProxy.cpp:
diff --git a/WebCore/platform/network/qt/QtNAMThreadSafeProxy.cpp b/WebCore/platform/network/qt/QtNAMThreadSafeProxy.cpp
index 22ea388..0caeb05 100644
--- a/WebCore/platform/network/qt/QtNAMThreadSafeProxy.cpp
+++ b/WebCore/platform/network/qt/QtNAMThreadSafeProxy.cpp
@@ -85,9 +85,7 @@ QtNetworkReplyThreadSafeProxy::QtNetworkReplyThreadSafeProxy(QNetworkAccessManag
     connect(this, SIGNAL(localHeadRequested(const QNetworkRequest&)), SLOT(localHead(const QNetworkRequest&)));
     connect(this, SIGNAL(localPutRequested(const QNetworkRequest&, QIODevice*)), SLOT(localPut(const QNetworkRequest&, QIODevice*)));
     connect(this, SIGNAL(localDeleteResourceRequested(const QNetworkRequest&)), SLOT(localDeleteResource(const QNetworkRequest&)));
-#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
     connect(this, SIGNAL(localCustomRequestRequested(const QNetworkRequest&, const QByteArray&)), SLOT(localCustomRequest(const QNetworkRequest&, const QByteArray&)));
-#endif
     connect(this, SIGNAL(localAbortRequested()), SLOT(localAbort()));
     connect(this, SIGNAL(localSetForwardingDeferedRequested(bool)), SLOT(localSetForwardingDefered(bool)));
 }
@@ -122,12 +120,12 @@ void QtNetworkReplyThreadSafeProxy::localDeleteResource(const QNetworkRequest& r
     localSetReply(m_manager->deleteResource(request));
 }
 
-#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
 void QtNetworkReplyThreadSafeProxy::localCustomRequest(const QNetworkRequest& request, const QByteArray& verb)
 {
+#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
     localSetReply(m_manager->sendCustomRequest(request, verb));
-}
 #endif
+}
 
 void QtNetworkReplyThreadSafeProxy::localAbort()
 {
diff --git a/WebCore/platform/network/qt/QtNAMThreadSafeProxy.h b/WebCore/platform/network/qt/QtNAMThreadSafeProxy.h
index d7b5cef..3e0c189 100644
--- a/WebCore/platform/network/qt/QtNAMThreadSafeProxy.h
+++ b/WebCore/platform/network/qt/QtNAMThreadSafeProxy.h
@@ -137,9 +137,7 @@ signals:
     void localHeadRequested(const QNetworkRequest& request);
     void localPutRequested(const QNetworkRequest& request, QIODevice* data);
     void localDeleteResourceRequested(const QNetworkRequest& request);
-#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
     void localCustomRequestRequested(const QNetworkRequest& request, const QByteArray& verb);
-#endif
     void localAbortRequested();
     void localSetForwardingDeferedRequested(bool forwardingDefered);
 
@@ -155,9 +153,7 @@ private slots:
     void localHead(const QNetworkRequest& request);
     void localPut(const QNetworkRequest& request, QIODevice* data);
     void localDeleteResource(const QNetworkRequest& request);
-#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
     void localCustomRequest(const QNetworkRequest& request, const QByteArray& verb);
-#endif
     void localAbort();
     void localForwardData();
     void localSetForwardingDefered(bool forwardingDefered);

-- 
WebKit Debian packaging