From 63070140f86fd352ef339ca6e8ca1cba1b1c07d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Fri, 21 Jan 2011 13:35:16 +0000 Subject: [PATCH] patch was defect; refs #22 --- qt/patch/qt-sources-patch.diff | 84 +++++++++++++++++----------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/qt/patch/qt-sources-patch.diff b/qt/patch/qt-sources-patch.diff index d7c7e4f..8b08763 100644 --- a/qt/patch/qt-sources-patch.diff +++ b/qt/patch/qt-sources-patch.diff @@ -1,6 +1,6 @@ -diff -ur /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/network/access/qhttpnetworkconnectionchannel.cpp /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1.patched//src/network/access/qhttpnetworkconnectionchannel.cpp ---- /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/network/access/qhttpnetworkconnectionchannel.cpp 2010-11-06 02:55:17.000000000 +0100 -+++ /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1.patched//src/network/access/qhttpnetworkconnectionchannel.cpp 2011-01-18 07:55:13.614841004 +0100 +diff -ru qt-everywhere-opensource-src-4.7.1/src/network/access/qhttpnetworkconnectionchannel.cpp qt-everywhere-opensource-src-4.7.1.patched/src/network/access/qhttpnetworkconnectionchannel.cpp +--- qt-everywhere-opensource-src-4.7.1/src/network/access/qhttpnetworkconnectionchannel.cpp 2010-11-06 02:55:17.000000000 +0100 ++++ qt-everywhere-opensource-src-4.7.1.patched/src/network/access/qhttpnetworkconnectionchannel.cpp 2011-01-18 07:55:13.614841004 +0100 @@ -130,6 +130,9 @@ QObject::connect(sslSocket, SIGNAL(encryptedBytesWritten(qint64)), this, SLOT(_q_encryptedBytesWritten(qint64)), @@ -25,9 +25,9 @@ diff -ur /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/ne void QHttpNetworkConnectionChannel::_q_encryptedBytesWritten(qint64 bytes) { Q_UNUSED(bytes); -diff -ur /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/network/access/qhttpnetworkconnectionchannel_p.h /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1.patched//src/network/access/qhttpnetworkconnectionchannel_p.h ---- /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/network/access/qhttpnetworkconnectionchannel_p.h 2010-11-06 02:55:18.000000000 +0100 -+++ /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1.patched//src/network/access/qhttpnetworkconnectionchannel_p.h 2011-01-18 07:55:13.614841004 +0100 +diff -ru qt-everywhere-opensource-src-4.7.1/src/network/access/qhttpnetworkconnectionchannel_p.h qt-everywhere-opensource-src-4.7.1.patched/src/network/access/qhttpnetworkconnectionchannel_p.h +--- qt-everywhere-opensource-src-4.7.1/src/network/access/qhttpnetworkconnectionchannel_p.h 2010-11-06 02:55:18.000000000 +0100 ++++ qt-everywhere-opensource-src-4.7.1.patched/src/network/access/qhttpnetworkconnectionchannel_p.h 2011-01-18 07:55:13.614841004 +0100 @@ -76,6 +76,10 @@ # include #endif @@ -47,9 +47,9 @@ diff -ur /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/ne void _q_encryptedBytesWritten(qint64 bytes); // proceed sending #endif }; -diff -ur /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/network/access/qhttpnetworkconnection_p.h /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1.patched//src/network/access/qhttpnetworkconnection_p.h ---- /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/network/access/qhttpnetworkconnection_p.h 2010-11-06 02:55:18.000000000 +0100 -+++ /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1.patched//src/network/access/qhttpnetworkconnection_p.h 2011-01-18 07:55:13.614841004 +0100 +diff -ru qt-everywhere-opensource-src-4.7.1/src/network/access/qhttpnetworkconnection_p.h qt-everywhere-opensource-src-4.7.1.patched/src/network/access/qhttpnetworkconnection_p.h +--- qt-everywhere-opensource-src-4.7.1/src/network/access/qhttpnetworkconnection_p.h 2010-11-06 02:55:18.000000000 +0100 ++++ qt-everywhere-opensource-src-4.7.1.patched/src/network/access/qhttpnetworkconnection_p.h 2011-01-18 07:55:13.614841004 +0100 @@ -123,6 +123,7 @@ Q_SIGNALS: @@ -58,9 +58,9 @@ diff -ur /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/ne #endif Q_SIGNALS: -diff -ur /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkaccessbackend.cpp /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1.patched//src/network/access/qnetworkaccessbackend.cpp ---- /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkaccessbackend.cpp 2010-11-06 02:55:17.000000000 +0100 -+++ /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1.patched//src/network/access/qnetworkaccessbackend.cpp 2011-01-18 07:55:13.614841004 +0100 +diff -ru qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkaccessbackend.cpp qt-everywhere-opensource-src-4.7.1.patched/src/network/access/qnetworkaccessbackend.cpp +--- qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkaccessbackend.cpp 2010-11-06 02:55:17.000000000 +0100 ++++ qt-everywhere-opensource-src-4.7.1.patched/src/network/access/qnetworkaccessbackend.cpp 2011-01-18 07:55:13.614841004 +0100 @@ -385,4 +385,13 @@ } #endif @@ -75,9 +75,9 @@ diff -ur /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/ne +} + QT_END_NAMESPACE -diff -ur /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkaccessbackend_p.h /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1.patched//src/network/access/qnetworkaccessbackend_p.h ---- /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkaccessbackend_p.h 2010-11-06 02:55:17.000000000 +0100 -+++ /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1.patched//src/network/access/qnetworkaccessbackend_p.h 2011-01-18 07:55:13.614841004 +0100 +diff -ru qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkaccessbackend_p.h qt-everywhere-opensource-src-4.7.1.patched/src/network/access/qnetworkaccessbackend_p.h +--- qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkaccessbackend_p.h 2010-11-06 02:55:17.000000000 +0100 ++++ qt-everywhere-opensource-src-4.7.1.patched/src/network/access/qnetworkaccessbackend_p.h 2011-01-18 07:55:13.614841004 +0100 @@ -56,6 +56,10 @@ #include "qnetworkreplyimpl_p.h" #include "QtCore/qobject.h" @@ -97,9 +97,9 @@ diff -ur /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/ne private: friend class QNetworkAccessManager; -diff -ur /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkaccesshttpbackend.cpp /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1.patched//src/network/access/qnetworkaccesshttpbackend.cpp ---- /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkaccesshttpbackend.cpp 2010-11-06 02:55:17.000000000 +0100 -+++ /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1.patched//src/network/access/qnetworkaccesshttpbackend.cpp 2011-01-18 07:55:13.614841004 +0100 +diff -ru qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkaccesshttpbackend.cpp qt-everywhere-opensource-src-4.7.1.patched/src/network/access/qnetworkaccesshttpbackend.cpp +--- qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkaccesshttpbackend.cpp 2010-11-06 02:55:17.000000000 +0100 ++++ qt-everywhere-opensource-src-4.7.1.patched/src/network/access/qnetworkaccesshttpbackend.cpp 2011-01-18 07:55:13.614841004 +0100 @@ -353,6 +353,8 @@ #ifndef QT_NO_OPENSSL connect(http, SIGNAL(sslErrors(QList)), @@ -109,9 +109,9 @@ diff -ur /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/ne #endif } -diff -ur /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkaccessmanager.cpp /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1.patched//src/network/access/qnetworkaccessmanager.cpp ---- /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkaccessmanager.cpp 2010-11-06 02:55:17.000000000 +0100 -+++ /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1.patched//src/network/access/qnetworkaccessmanager.cpp 2011-01-18 07:55:13.614841004 +0100 +diff -ru qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkaccessmanager.cpp qt-everywhere-opensource-src-4.7.1.patched/src/network/access/qnetworkaccessmanager.cpp +--- qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkaccessmanager.cpp 2010-11-06 02:55:17.000000000 +0100 ++++ qt-everywhere-opensource-src-4.7.1.patched/src/network/access/qnetworkaccessmanager.cpp 2011-01-18 07:55:13.614841004 +0100 @@ -1066,6 +1066,16 @@ #endif } @@ -137,9 +137,9 @@ diff -ur /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/ne #endif return reply; -diff -ur /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkaccessmanager.h /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1.patched//src/network/access/qnetworkaccessmanager.h ---- /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkaccessmanager.h 2010-11-06 02:55:17.000000000 +0100 -+++ /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1.patched//src/network/access/qnetworkaccessmanager.h 2011-01-18 08:35:08.334841003 +0100 +diff -ru qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkaccessmanager.h qt-everywhere-opensource-src-4.7.1.patched/src/network/access/qnetworkaccessmanager.h +--- qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkaccessmanager.h 2010-11-06 02:55:17.000000000 +0100 ++++ qt-everywhere-opensource-src-4.7.1.patched/src/network/access/qnetworkaccessmanager.h 2011-01-18 08:35:08.334841003 +0100 @@ -46,6 +46,10 @@ QT_BEGIN_HEADER @@ -175,9 +175,9 @@ diff -ur /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/ne #if !defined(QT_NO_BEARERMANAGEMENT) && !defined(QT_MOBILITY_BEARER) Q_PRIVATE_SLOT(d_func(), void _q_networkSessionClosed()) Q_PRIVATE_SLOT(d_func(), void _q_networkSessionNewConfigurationActivated()) -diff -ur /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkaccessmanager_p.h /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1.patched//src/network/access/qnetworkaccessmanager_p.h ---- /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkaccessmanager_p.h 2010-11-06 02:55:18.000000000 +0100 -+++ /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1.patched//src/network/access/qnetworkaccessmanager_p.h 2011-01-18 07:55:13.614841004 +0100 +diff -ru qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkaccessmanager_p.h qt-everywhere-opensource-src-4.7.1.patched/src/network/access/qnetworkaccessmanager_p.h +--- qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkaccessmanager_p.h 2010-11-06 02:55:18.000000000 +0100 ++++ qt-everywhere-opensource-src-4.7.1.patched/src/network/access/qnetworkaccessmanager_p.h 2011-01-18 07:55:13.614841004 +0100 @@ -60,6 +60,10 @@ #include "QtNetwork/qnetworkproxy.h" #include "QtNetwork/qnetworksession.h" @@ -197,9 +197,9 @@ diff -ur /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/ne QNetworkReply *postProcess(QNetworkReply *reply); void createCookieJar() const; -diff -ur /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkreply.h /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1.patched//src/network/access/qnetworkreply.h ---- /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkreply.h 2010-11-06 02:55:17.000000000 +0100 -+++ /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1.patched//src/network/access/qnetworkreply.h 2011-01-18 08:34:28.234841008 +0100 +diff -ru qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkreply.h qt-everywhere-opensource-src-4.7.1.patched/src/network/access/qnetworkreply.h +--- qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkreply.h 2010-11-06 02:55:17.000000000 +0100 ++++ qt-everywhere-opensource-src-4.7.1.patched/src/network/access/qnetworkreply.h 2011-01-18 08:34:28.234841008 +0100 @@ -51,6 +51,10 @@ QT_BEGIN_HEADER @@ -227,9 +227,9 @@ diff -ur /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/ne #endif void uploadProgress(qint64 bytesSent, qint64 bytesTotal); -diff -ur /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkreplyimpl.cpp /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1.patched//src/network/access/qnetworkreplyimpl.cpp ---- /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkreplyimpl.cpp 2010-11-06 02:55:17.000000000 +0100 -+++ /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1.patched//src/network/access/qnetworkreplyimpl.cpp 2011-01-18 07:55:13.614841004 +0100 +diff -ru qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkreplyimpl.cpp qt-everywhere-opensource-src-4.7.1.patched/src/network/access/qnetworkreplyimpl.cpp +--- qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkreplyimpl.cpp 2010-11-06 02:55:17.000000000 +0100 ++++ qt-everywhere-opensource-src-4.7.1.patched/src/network/access/qnetworkreplyimpl.cpp 2011-01-18 07:55:13.614841004 +0100 @@ -704,6 +704,16 @@ #endif } @@ -247,9 +247,9 @@ diff -ur /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/ne bool QNetworkReplyImplPrivate::isFinished() const { return (state == Finished || state == Aborted); -diff -ur /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkreplyimpl_p.h /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1.patched//src/network/access/qnetworkreplyimpl_p.h ---- /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkreplyimpl_p.h 2010-11-06 02:55:17.000000000 +0100 -+++ /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1.patched//src/network/access/qnetworkreplyimpl_p.h 2011-01-18 07:55:13.614841004 +0100 +diff -ru qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkreplyimpl_p.h qt-everywhere-opensource-src-4.7.1.patched/src/network/access/qnetworkreplyimpl_p.h +--- qt-everywhere-opensource-src-4.7.1/src/network/access/qnetworkreplyimpl_p.h 2010-11-06 02:55:17.000000000 +0100 ++++ qt-everywhere-opensource-src-4.7.1.patched/src/network/access/qnetworkreplyimpl_p.h 2011-01-18 07:55:13.614841004 +0100 @@ -63,6 +63,10 @@ #include "private/qringbuffer_p.h" #include "private/qbytedata_p.h" @@ -269,9 +269,9 @@ diff -ur /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/ne bool isFinished() const; -diff -ur /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/network/ssl/qsslsocket.h /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1.patched//src/network/ssl/qsslsocket.h ---- /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/network/ssl/qsslsocket.h 2010-11-06 02:55:18.000000000 +0100 -+++ /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1.patched//src/network/ssl/qsslsocket.h 2011-01-18 07:55:13.614841004 +0100 +diff -ru qt-everywhere-opensource-src-4.7.1/src/network/ssl/qsslsocket.h qt-everywhere-opensource-src-4.7.1.patched/src/network/ssl/qsslsocket.h +--- qt-everywhere-opensource-src-4.7.1/src/network/ssl/qsslsocket.h 2010-11-06 02:55:18.000000000 +0100 ++++ qt-everywhere-opensource-src-4.7.1.patched/src/network/ssl/qsslsocket.h 2011-01-18 07:55:13.614841004 +0100 @@ -52,6 +52,10 @@ QT_BEGIN_HEADER @@ -291,9 +291,9 @@ diff -ur /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/ne protected Q_SLOTS: void connectToHostImplementation(const QString &hostName, quint16 port, -diff -ur /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/network/ssl/qsslsocket_openssl.cpp /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1.patched//src/network/ssl/qsslsocket_openssl.cpp ---- /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1/src/network/ssl/qsslsocket_openssl.cpp 2010-11-06 02:55:18.000000000 +0100 -+++ /home/marc/svn/swisssurfer/qt/qt-everywhere-opensource-src-4.7.1.patched//src/network/ssl/qsslsocket_openssl.cpp 2011-01-18 07:56:51.924841003 +0100 +diff -ru qt-everywhere-opensource-src-4.7.1/src/network/ssl/qsslsocket_openssl.cpp qt-everywhere-opensource-src-4.7.1.patched/src/network/ssl/qsslsocket_openssl.cpp +--- qt-everywhere-opensource-src-4.7.1/src/network/ssl/qsslsocket_openssl.cpp 2010-11-06 02:55:18.000000000 +0100 ++++ qt-everywhere-opensource-src-4.7.1.patched/src/network/ssl/qsslsocket_openssl.cpp 2011-01-18 07:56:51.924841003 +0100 @@ -371,6 +371,8 @@ if (configuration.peerVerifyDepth != 0) q_SSL_CTX_set_verify_depth(ctx, configuration.peerVerifyDepth);