[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.5.1+dfsg-16ubuntu4-6-g934f670

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=d6fda48

The following commit has been merged in the ubuntu branch:
commit d6fda4878efb1da06793bf7a50cd2eb9a5bf07fc
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Thu Apr 7 11:22:20 2016 +0000

    debian/patches/fix-duplicate-qnam-finished.patch:
    
    * debian/patches/fix-duplicate-qnam-finished.patch:
      - Fix multiple calls to signals of QNAM object (LP: #1564142)
---
 debian/changelog                                 |  7 ++++
 debian/patches/fix-duplicate-qnam-finished.patch | 53 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 3 files changed, 61 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 56d6d01..27e97f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qtbase-opensource-src (5.5.1+dfsg-16ubuntu7) UNRELEASED; urgency=medium
+
+  * debian/patches/fix-duplicate-qnam-finished.patch:
+    - Fix multiple calls to signals of QNAM object (LP: #1564142)
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Thu, 07 Apr 2016 08:59:15 +0000
+
 qtbase-opensource-src (5.5.1+dfsg-16ubuntu6) xenial; urgency=medium
 
   [ Alberto Mardegan ]
diff --git a/debian/patches/fix-duplicate-qnam-finished.patch b/debian/patches/fix-duplicate-qnam-finished.patch
new file mode 100644
index 0000000..58c8e05
--- /dev/null
+++ b/debian/patches/fix-duplicate-qnam-finished.patch
@@ -0,0 +1,53 @@
+Index: qtbase-opensource-src-5.4.1+dfsg/src/network/access/qnetworkaccessmanager.cpp
+===================================================================
+--- qtbase-opensource-src-5.4.1+dfsg.orig/src/network/access/qnetworkaccessmanager.cpp
++++ qtbase-opensource-src-5.4.1+dfsg/src/network/access/qnetworkaccessmanager.cpp
+@@ -1340,23 +1340,11 @@ void QNetworkAccessManagerPrivate::_q_re
+ #endif
+ }
+ 
+-void QNetworkAccessManagerPrivate::_q_replyErrors(QNetworkReply::NetworkError error)
+-{
+-    Q_Q(QNetworkAccessManager);
+-
+-    QNetworkReply *reply = qobject_cast<QNetworkReply *>(q->sender());
+-
+-    qCDebug(lcQnam)<< error << reply;
+-    if (reply && error != QNetworkReply::NoError)
+-        emit q->finished(reply);
+-}
+-
+ QNetworkReply *QNetworkAccessManagerPrivate::postProcess(QNetworkReply *reply)
+ {
+     Q_Q(QNetworkAccessManager);
+     QNetworkReplyPrivate::setManager(reply, q);
+     q->connect(reply, SIGNAL(finished()), SLOT(_q_replyFinished()));
+-    q->connect(reply,SIGNAL(error(QNetworkReply::NetworkError)),SLOT(_q_replyErrors(QNetworkReply::NetworkError)));
+ #ifndef QT_NO_SSL
+     /* In case we're compiled without SSL support, we don't have this signal and we need to
+      * avoid getting a connection error. */
+Index: qtbase-opensource-src-5.4.1+dfsg/src/network/access/qnetworkaccessmanager.h
+===================================================================
+--- qtbase-opensource-src-5.4.1+dfsg.orig/src/network/access/qnetworkaccessmanager.h
++++ qtbase-opensource-src-5.4.1+dfsg/src/network/access/qnetworkaccessmanager.h
+@@ -169,8 +169,6 @@ private:
+     Q_PRIVATE_SLOT(d_func(), void _q_replyFinished())
+     Q_PRIVATE_SLOT(d_func(), void _q_replyEncrypted())
+     Q_PRIVATE_SLOT(d_func(), void _q_replySslErrors(QList<QSslError>))
+-    Q_PRIVATE_SLOT(d_func(), void _q_replyErrors(QNetworkReply::NetworkError))
+-
+ #ifndef QT_NO_BEARERMANAGEMENT
+     Q_PRIVATE_SLOT(d_func(), void _q_networkSessionClosed())
+     Q_PRIVATE_SLOT(d_func(), void _q_networkSessionStateChanged(QNetworkSession::State))
+Index: qtbase-opensource-src-5.4.1+dfsg/src/network/access/qnetworkaccessmanager_p.h
+===================================================================
+--- qtbase-opensource-src-5.4.1+dfsg.orig/src/network/access/qnetworkaccessmanager_p.h
++++ qtbase-opensource-src-5.4.1+dfsg/src/network/access/qnetworkaccessmanager_p.h
+@@ -107,7 +107,6 @@ public:
+     void _q_replyFinished();
+     void _q_replyEncrypted();
+     void _q_replySslErrors(const QList<QSslError> &errors);
+-    void _q_replyErrors(QNetworkReply::NetworkError);
+ 
+     QNetworkReply *postProcess(QNetworkReply *reply);
+     void createCookieJar() const;
diff --git a/debian/patches/series b/debian/patches/series
index b6a7701..7b7ede8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -47,3 +47,4 @@ net-bearer-nm-disconnect-ap-signals7.patch
 qnam-ubuntu-fix6.patch
 disable_overlay_scrollbars.diff
 xcb_fix_parent_screen_of_embedded_windows.patch
+fix-duplicate-qnam-finished.patch

-- 
qtbase packaging