[SCM] qtbase packaging branch, ubuntu, updated. debian/5.5.0+dfsg-4-61-gfdfaff5
Timo Jyrinki
timo at moszumanska.debian.org
Thu Oct 15 10:59:31 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=bb612b6
The following commit has been merged in the ubuntu branch:
commit bb612b6eaed85fb4186fbcacc17b2cdbf1c5610b
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Thu Oct 15 10:45:42 2015 +0000
Remove two patches included in 5.5.1.
---
.../patches/Fix-compile-error-on-big-endian.patch | 28 --
.../Network-Fix-up-previous-corruption-patch.patch | 432 ---------------------
debian/patches/series | 2 -
3 files changed, 462 deletions(-)
diff --git a/debian/patches/Fix-compile-error-on-big-endian.patch b/debian/patches/Fix-compile-error-on-big-endian.patch
deleted file mode 100644
index d8bcae0..0000000
--- a/debian/patches/Fix-compile-error-on-big-endian.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 1a8b161da80b93d122854c854c95bf9f7d326cdc Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen at theqtcompany.com>
-Date: Fri, 3 Jul 2015 14:19:02 +0200
-Subject: [PATCH] Fix compile error on big endian
-
-DestFormat is not defined here but should be Format_RGBX8888
-
-Change-Id: Ie33989a6fc31650434281a6b7b0f4806524268af
----
- src/gui/image/qimage_conversions.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gui/image/qimage_conversions.cpp b/src/gui/image/qimage_conversions.cpp
-index e0ca2c5..02f32aa 100644
---- a/src/gui/image/qimage_conversions.cpp
-+++ b/src/gui/image/qimage_conversions.cpp
-@@ -1103,7 +1103,7 @@ static bool mask_alpha_converter_rgbx_inplace(QImageData *data, Qt::ImageConvers
- }
- rgb_data += pad;
- }
-- data->format = DestFormat;
-+ data->format = QImage::Format_RGBX8888;
- return true;
- #endif
- }
---
-2.1.4
-
diff --git a/debian/patches/Network-Fix-up-previous-corruption-patch.patch b/debian/patches/Network-Fix-up-previous-corruption-patch.patch
deleted file mode 100644
index d086b4b..0000000
--- a/debian/patches/Network-Fix-up-previous-corruption-patch.patch
+++ /dev/null
@@ -1,432 +0,0 @@
-From 65fa73dab98068c475c87ccf7f4d8eab1d9fba07 Mon Sep 17 00:00:00 2001
-From: Markus Goetz <markus at woboq.com>
-Date: Fri, 19 Jun 2015 15:35:34 +0200
-Subject: [PATCH] Network: Fix up previous corruption patch
-
-This is a fix-up for I54c883925ec897050941498f139c4b523030432e.
-That patch lead to some internal state issues that lead to the QTBUG-47048
-or to QNetworkReply objects erroring with "Connection Closed" when
-the server closed the Keep-Alive connection.
-
-This patch changes the QNAM socket slot connections to be DirectConnection.
-We don't close the socket anymore in slots where it is anyway in a closed state
-afterwards. This prevents event/stack recursions.
-We also flush QSslSocket/QTcpSocket receive buffers when receiving a disconnect
-so that the developer always gets the full decrypted data from the buffers.
-
-Change-Id: Ib4d6a2d0d988317e3a5356f36e8dbcee4590beed
-Task-number: QTBUG-47048
----
- src/network/access/qhttpnetworkconnection.cpp | 1 -
- .../access/qhttpnetworkconnectionchannel.cpp | 108 +++++++++++++--------
- .../access/qhttpnetworkconnectionchannel_p.h | 1 +
- src/network/access/qhttpnetworkreply.cpp | 2 +-
- src/network/access/qhttpprotocolhandler.cpp | 1 -
- src/network/socket/qabstractsocket.cpp | 7 +-
- src/network/ssl/qsslsocket.cpp | 8 ++
- src/network/ssl/qsslsocket_openssl.cpp | 7 ++
- .../access/qnetworkreply/tst_qnetworkreply.cpp | 9 +-
- 9 files changed, 94 insertions(+), 50 deletions(-)
-
-diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
-index 365ce55..543c70e 100644
---- a/src/network/access/qhttpnetworkconnection.cpp
-+++ b/src/network/access/qhttpnetworkconnection.cpp
-@@ -917,7 +917,6 @@ void QHttpNetworkConnectionPrivate::_q_startNextRequest()
- for (int i = 0; i < channelCount; ++i) {
- if (channels[i].resendCurrent && (channels[i].state != QHttpNetworkConnectionChannel::ClosingState)) {
- channels[i].resendCurrent = false;
-- channels[i].state = QHttpNetworkConnectionChannel::IdleState;
-
- // if this is not possible, error will be emitted and connection terminated
- if (!channels[i].resetUploadData())
-diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
-index 49c6793..07ce56b 100644
---- a/src/network/access/qhttpnetworkconnectionchannel.cpp
-+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
-@@ -58,6 +58,11 @@ QT_BEGIN_NAMESPACE
-
- // TODO: Put channel specific stuff here so it does not polute qhttpnetworkconnection.cpp
-
-+// Because in-flight when sending a request, the server might close our connection (because the persistent HTTP
-+// connection times out)
-+// We use 3 because we can get a _q_error 3 times depending on the timing:
-+static const int reconnectAttemptsDefault = 3;
-+
- QHttpNetworkConnectionChannel::QHttpNetworkConnectionChannel()
- : socket(0)
- , ssl(false)
-@@ -69,7 +74,7 @@ QHttpNetworkConnectionChannel::QHttpNetworkConnectionChannel()
- , resendCurrent(false)
- , lastStatus(0)
- , pendingEncrypt(false)
-- , reconnectAttempts(2)
-+ , reconnectAttempts(reconnectAttemptsDefault)
- , authMethod(QAuthenticatorPrivate::None)
- , proxyAuthMethod(QAuthenticatorPrivate::None)
- , authenticationCredentialsSent(false)
-@@ -106,19 +111,18 @@ void QHttpNetworkConnectionChannel::init()
- socket->setProxy(QNetworkProxy::NoProxy);
- #endif
-
-- // We want all signals (except the interactive ones) be connected as QueuedConnection
-- // because else we're falling into cases where we recurse back into the socket code
-- // and mess up the state. Always going to the event loop (and expecting that when reading/writing)
-- // is safer.
-+ // After some back and forth in all the last years, this is now a DirectConnection because otherwise
-+ // the state inside the *Socket classes gets messed up, also in conjunction with the socket notifiers
-+ // which behave slightly differently on Windows vs Linux
- QObject::connect(socket, SIGNAL(bytesWritten(qint64)),
- this, SLOT(_q_bytesWritten(qint64)),
-- Qt::QueuedConnection);
-+ Qt::DirectConnection);
- QObject::connect(socket, SIGNAL(connected()),
- this, SLOT(_q_connected()),
-- Qt::QueuedConnection);
-+ Qt::DirectConnection);
- QObject::connect(socket, SIGNAL(readyRead()),
- this, SLOT(_q_readyRead()),
-- Qt::QueuedConnection);
-+ Qt::DirectConnection);
-
- // The disconnected() and error() signals may already come
- // while calling connectToHost().
-@@ -129,10 +133,10 @@ void QHttpNetworkConnectionChannel::init()
- qRegisterMetaType<QAbstractSocket::SocketError>();
- QObject::connect(socket, SIGNAL(disconnected()),
- this, SLOT(_q_disconnected()),
-- Qt::QueuedConnection);
-+ Qt::DirectConnection);
- QObject::connect(socket, SIGNAL(error(QAbstractSocket::SocketError)),
- this, SLOT(_q_error(QAbstractSocket::SocketError)),
-- Qt::QueuedConnection);
-+ Qt::DirectConnection);
-
-
- #ifndef QT_NO_NETWORKPROXY
-@@ -147,16 +151,16 @@ void QHttpNetworkConnectionChannel::init()
- // won't be a sslSocket if encrypt is false
- QObject::connect(sslSocket, SIGNAL(encrypted()),
- this, SLOT(_q_encrypted()),
-- Qt::QueuedConnection);
-+ Qt::DirectConnection);
- QObject::connect(sslSocket, SIGNAL(sslErrors(QList<QSslError>)),
- this, SLOT(_q_sslErrors(QList<QSslError>)),
- Qt::DirectConnection);
- QObject::connect(sslSocket, SIGNAL(preSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator*)),
- this, SLOT(_q_preSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator*)),
- Qt::DirectConnection);
- QObject::connect(sslSocket, SIGNAL(encryptedBytesWritten(qint64)),
- this, SLOT(_q_encryptedBytesWritten(qint64)),
-- Qt::QueuedConnection);
-+ Qt::DirectConnection);
-
- if (ignoreAllSslErrors)
- sslSocket->ignoreSslErrors();
-@@ -397,7 +401,7 @@ void QHttpNetworkConnectionChannel::allDone()
-
- // reset the reconnection attempts after we receive a complete reply.
- // in case of failures, each channel will attempt two reconnects before emitting error.
-- reconnectAttempts = 2;
-+ reconnectAttempts = reconnectAttemptsDefault;
-
- // now the channel can be seen as free/idle again, all signal emissions for the reply have been done
- if (state != QHttpNetworkConnectionChannel::ClosingState)
-@@ -651,6 +655,15 @@ void QHttpNetworkConnectionChannel::closeAndResendCurrentRequest()
- QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
- }
-
-+void QHttpNetworkConnectionChannel::resendCurrentRequest()
-+{
-+ requeueCurrentlyPipelinedRequests();
-+ if (reply)
-+ resendCurrent = true;
-+ if (qobject_cast<QHttpNetworkConnection*>(connection))
-+ QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
-+}
-+
- bool QHttpNetworkConnectionChannel::isSocketBusy() const
- {
- return (state & QHttpNetworkConnectionChannel::BusyState);
-@@ -694,8 +707,8 @@ void QHttpNetworkConnectionChannel::_q_disconnected()
- return;
- }
-
-- // read the available data before closing
-- if (isSocketWaiting() || isSocketReading()) {
-+ // read the available data before closing (also done in _q_error for other codepaths)
-+ if ((isSocketWaiting() || isSocketReading()) && socket->bytesAvailable()) {
- if (reply) {
- state = QHttpNetworkConnectionChannel::ReadingState;
- _q_receiveReply();
-@@ -707,7 +720,8 @@ void QHttpNetworkConnectionChannel::_q_disconnected()
- state = QHttpNetworkConnectionChannel::IdleState;
-
- requeueCurrentlyPipelinedRequests();
-- close();
-+
-+ pendingEncrypt = false;
- }
-
-
-@@ -789,11 +803,19 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
- errorCode = QNetworkReply::ConnectionRefusedError;
- break;
- case QAbstractSocket::RemoteHostClosedError:
-- // try to reconnect/resend before sending an error.
-- // while "Reading" the _q_disconnected() will handle this.
-- if (state != QHttpNetworkConnectionChannel::IdleState && state != QHttpNetworkConnectionChannel::ReadingState) {
-+ // This error for SSL comes twice in a row, first from SSL layer ("The TLS/SSL connection has been closed") then from TCP layer.
-+ // Depending on timing it can also come three times in a row (first time when we try to write into a closing QSslSocket).
-+ // The reconnectAttempts handling catches the cases where we can re-send the request.
-+ if (!reply && state == QHttpNetworkConnectionChannel::IdleState) {
-+ // Not actually an error, it is normal for Keep-Alive connections to close after some time if no request
-+ // is sent on them. No need to error the other replies below. Just bail out here.
-+ // The _q_disconnected will handle the possibly pipelined replies
-+ return;
-+ } else if (state != QHttpNetworkConnectionChannel::IdleState && state != QHttpNetworkConnectionChannel::ReadingState) {
-+ // Try to reconnect/resend before sending an error.
-+ // While "Reading" the _q_disconnected() will handle this.
- if (reconnectAttempts-- > 0) {
-- closeAndResendCurrentRequest();
-+ resendCurrentRequest();
- return;
- } else {
- errorCode = QNetworkReply::RemoteHostClosedError;
-@@ -818,24 +840,15 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
- // we can ignore the readbuffersize as the data is already
- // in memory and we will not receive more data on the socket.
- reply->setReadBufferSize(0);
-+ reply->setDownstreamLimited(false);
- _q_receiveReply();
--#ifndef QT_NO_SSL
-- if (ssl) {
-- // QT_NO_OPENSSL. The QSslSocket can still have encrypted bytes in the plainsocket.
-- // So we need to check this if the socket is a QSslSocket. When the socket is flushed
-- // it will force a decrypt of the encrypted data in the plainsocket.
-- QSslSocket *sslSocket = static_cast<QSslSocket*>(socket);
-- qint64 beforeFlush = sslSocket->encryptedBytesAvailable();
-- while (sslSocket->encryptedBytesAvailable()) {
-- sslSocket->flush();
-- _q_receiveReply();
-- qint64 afterFlush = sslSocket->encryptedBytesAvailable();
-- if (afterFlush == beforeFlush)
-- break;
-- beforeFlush = afterFlush;
-- }
-+ if (!reply) {
-+ // No more reply assigned after the previous call? Then it had been finished sucessfully.
-+ requeueCurrentlyPipelinedRequests();
-+ state = QHttpNetworkConnectionChannel::IdleState;
-+ QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
-+ return;
- }
--#endif
- }
-
- errorCode = QNetworkReply::RemoteHostClosedError;
-@@ -846,7 +859,7 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
- case QAbstractSocket::SocketTimeoutError:
- // try to reconnect/resend before sending an error.
- if (state == QHttpNetworkConnectionChannel::WritingState && (reconnectAttempts-- > 0)) {
-- closeAndResendCurrentRequest();
-+ resendCurrentRequest();
- return;
- }
- errorCode = QNetworkReply::TimeoutError;
-@@ -860,7 +873,7 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
- case QAbstractSocket::ProxyConnectionClosedError:
- // try to reconnect/resend before sending an error.
- if (reconnectAttempts-- > 0) {
-- closeAndResendCurrentRequest();
-+ resendCurrentRequest();
- return;
- }
- errorCode = QNetworkReply::ProxyConnectionClosedError;
-@@ -868,7 +881,7 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
- case QAbstractSocket::ProxyConnectionTimeoutError:
- // try to reconnect/resend before sending an error.
- if (reconnectAttempts-- > 0) {
-- closeAndResendCurrentRequest();
-+ resendCurrentRequest();
- return;
- }
- errorCode = QNetworkReply::ProxyTimeoutError;
-@@ -916,8 +929,18 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
- // send the next request
- QMetaObject::invokeMethod(that, "_q_startNextRequest", Qt::QueuedConnection);
-
-- if (that) //signal emission triggered event loop
-- close();
-+ if (that) {
-+ //signal emission triggered event loop
-+ if (!socket)
-+ state = QHttpNetworkConnectionChannel::IdleState;
-+ else if (socket->state() == QAbstractSocket::UnconnectedState)
-+ state = QHttpNetworkConnectionChannel::IdleState;
-+ else
-+ state = QHttpNetworkConnectionChannel::ClosingState;
-+
-+ // pendingEncrypt must only be true in between connected and encrypted states
-+ pendingEncrypt = false;
-+ }
- }
-
- #ifndef QT_NO_NETWORKPROXY
-@@ -941,7 +964,8 @@ void QHttpNetworkConnectionChannel::_q_proxyAuthenticationRequired(const QNetwor
-
- void QHttpNetworkConnectionChannel::_q_uploadDataReadyRead()
- {
-- sendRequest();
-+ if (reply)
-+ sendRequest();
- }
-
- #ifndef QT_NO_SSL
-diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h
-index 231fe11..a834b7d 100644
---- a/src/network/access/qhttpnetworkconnectionchannel_p.h
-+++ b/src/network/access/qhttpnetworkconnectionchannel_p.h
-@@ -169,6 +169,7 @@ public:
-
- void handleUnexpectedEOF();
- void closeAndResendCurrentRequest();
-+ void resendCurrentRequest();
-
- bool isSocketBusy() const;
- bool isSocketWriting() const;
-diff --git a/src/network/access/qhttpnetworkreply.cpp b/src/network/access/qhttpnetworkreply.cpp
-index 55863a3..8b71bd8 100644
---- a/src/network/access/qhttpnetworkreply.cpp
-+++ b/src/network/access/qhttpnetworkreply.cpp
-@@ -191,7 +191,7 @@ QByteArray QHttpNetworkReply::readAny()
- return QByteArray();
-
- // we'll take the last buffer, so schedule another read from http
-- if (d->downstreamLimited && d->responseData.bufferCount() == 1)
-+ if (d->downstreamLimited && d->responseData.bufferCount() == 1 && !isFinished())
- d->connection->d_func()->readMoreLater(this);
- return d->responseData.read();
- }
-diff --git a/src/network/access/qhttpprotocolhandler.cpp b/src/network/access/qhttpprotocolhandler.cpp
-index 3357948..380aaac 100644
---- a/src/network/access/qhttpprotocolhandler.cpp
-+++ b/src/network/access/qhttpprotocolhandler.cpp
-@@ -250,7 +250,6 @@ bool QHttpProtocolHandler::sendRequest()
- if (!m_reply) {
- // heh, how should that happen!
- qWarning() << "QAbstractProtocolHandler::sendRequest() called without QHttpNetworkReply";
-- m_channel->state = QHttpNetworkConnectionChannel::IdleState;
- return false;
- }
-
-diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
-index 2666771..0e82d4a 100644
---- a/src/network/socket/qabstractsocket.cpp
-+++ b/src/network/socket/qabstractsocket.cpp
-@@ -768,6 +768,7 @@ bool QAbstractSocketPrivate::canReadNotification()
- void QAbstractSocketPrivate::canCloseNotification()
- {
- Q_Q(QAbstractSocket);
-+ // Note that this method is only called on Windows. Other platforms close in the canReadNotification()
-
- #if defined (QABSTRACTSOCKET_DEBUG)
- qDebug("QAbstractSocketPrivate::canCloseNotification()");
-@@ -777,7 +778,11 @@ void QAbstractSocketPrivate::canCloseNotification()
- if (isBuffered) {
- // Try to read to the buffer, if the read fail we can close the socket.
- newBytes = buffer.size();
-- if (!readFromSocket()) {
-+ qint64 oldReadBufferMaxSize = readBufferMaxSize;
-+ readBufferMaxSize = 0; // temporarily disable max read buffer, we want to empty the OS buffer
-+ bool hadReadFromSocket = readFromSocket();
-+ readBufferMaxSize = oldReadBufferMaxSize;
-+ if (!hadReadFromSocket) {
- q->disconnectFromHost();
- return;
- }
-diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
-index c1fab94..2b9e923 100644
---- a/src/network/ssl/qsslsocket.cpp
-+++ b/src/network/ssl/qsslsocket.cpp
-@@ -2294,6 +2294,14 @@ void QSslSocketPrivate::_q_errorSlot(QAbstractSocket::SocketError error)
- qCDebug(lcSsl) << " state =" << q->state();
- qCDebug(lcSsl) << " errorString =" << q->errorString();
- #endif
-+ // this moves encrypted bytes from plain socket into our buffer
-+ if (plainSocket->bytesAvailable()) {
-+ qint64 tmpReadBufferMaxSize = readBufferMaxSize;
-+ readBufferMaxSize = 0; // reset temporarily so the plain sockets completely drained drained
-+ transmit();
-+ readBufferMaxSize = tmpReadBufferMaxSize;
-+ }
-+
- q->setSocketError(plainSocket->error());
- q->setErrorString(plainSocket->errorString());
- emit q->error(error);
-diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
-index ac4336a..94655fe 100644
---- a/src/network/ssl/qsslsocket_openssl.cpp
-+++ b/src/network/ssl/qsslsocket_openssl.cpp
-@@ -1419,6 +1419,13 @@ void QSslSocketBackendPrivate::disconnected()
- {
- if (plainSocket->bytesAvailable() <= 0)
- destroySslContext();
-+ else {
-+ // Move all bytes into the plain buffer
-+ qint64 tmpReadBufferMaxSize = readBufferMaxSize;
-+ readBufferMaxSize = 0; // reset temporarily so the plain socket buffer is completely drained
-+ transmit();
-+ readBufferMaxSize = tmpReadBufferMaxSize;
-+ }
- //if there is still buffered data in the plain socket, don't destroy the ssl context yet.
- //it will be destroyed when the socket is deleted.
- }
-diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
-index d2edf67..138f528 100644
---- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
-+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
-@@ -1051,7 +1051,7 @@ protected:
- // clean up QAbstractSocket's residue:
- while (client->bytesToWrite() > 0) {
- qDebug() << "Still having" << client->bytesToWrite() << "bytes to write, doing that now";
-- if (!client->waitForBytesWritten(2000)) {
-+ if (!client->waitForBytesWritten(10000)) {
- qDebug() << "ERROR: FastSender:" << client->error() << "cleaning up residue";
- return;
- }
-@@ -1071,7 +1071,7 @@ protected:
- measuredSentBytes += writeNextData(client, bytesToWrite);
-
- while (client->bytesToWrite() > 0) {
-- if (!client->waitForBytesWritten(2000)) {
-+ if (!client->waitForBytesWritten(10000)) {
- qDebug() << "ERROR: FastSender:" << client->error() << "during blocking write";
- return;
- }
-@@ -7946,7 +7946,7 @@ public slots:
- m_receivedData += data;
- if (!m_parsedHeaders && m_receivedData.contains("
")) {
- m_parsedHeaders = true;
-- QTimer::singleShot(qrand()%10, this, SLOT(closeDelayed())); // simulate random network latency
-+ QTimer::singleShot(qrand()%60, this, SLOT(closeDelayed())); // simulate random network latency
- // This server simulates a web server connection closing, e.g. because of Apaches MaxKeepAliveRequests or KeepAliveTimeout
- // In this case QNAM needs to re-send the upload data but it had a bug which then corrupts the upload
- // This test catches that.
-@@ -8052,11 +8052,12 @@ void tst_QNetworkReply::putWithServerClosingConnectionImmediately()
-
- // get the request started and the incoming socket connected
- QTestEventLoop::instance().enterLoop(10);
-+ QVERIFY(!QTestEventLoop::instance().timeout());
-
- //qDebug() << "correct=" << server.m_correctUploads << "corrupt=" << server.m_corruptUploads << "expected=" <<numUploads;
-
- // Sanity check because ecause of 9c2ecf89 most replies will error out but we want to make sure at least some of them worked
-- QVERIFY(server.m_correctUploads > 5);
-+ QVERIFY(server.m_correctUploads > 2);
- // Because actually important is that we don't get any corruption:
- QCOMPARE(server.m_corruptUploads, 0);
-
---
-2.5.0
-
diff --git a/debian/patches/series b/debian/patches/series
index 682f2fd..7c3675d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
# Backported stuff
Add-environment-variable-support-for-testability-lib.patch
-Fix-compile-error-on-big-endian.patch
-Network-Fix-up-previous-corruption-patch.patch
Add-an-option-to-skip-the-generic-bearer-engine.patch
Blacklist-PowerVR-Rogue-G6200-v1.3-from-supporting-B.patch
#Make-sure-networkAccessibilityChanged-is-emitted.patch
--
qtbase packaging
More information about the pkg-kde-commits
mailing list