[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=4eff29e

The following commit has been merged in the ubuntu branch:
commit 4eff29eb8b1214e9404b8e167c91411cbfb9eddb
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Thu Apr 7 12:58:37 2016 +0000

    Rebase fix-duplicate-qnam-finished.patch to 5.5.1.
---
 debian/patches/fix-duplicate-qnam-finished.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/patches/fix-duplicate-qnam-finished.patch b/debian/patches/fix-duplicate-qnam-finished.patch
index 58c8e05..6bcc9f5 100644
--- a/debian/patches/fix-duplicate-qnam-finished.patch
+++ b/debian/patches/fix-duplicate-qnam-finished.patch
@@ -31,9 +31,9 @@ Index: qtbase-opensource-src-5.4.1+dfsg/src/network/access/qnetworkaccessmanager
 --- 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_replyPreSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator*))
 -    Q_PRIVATE_SLOT(d_func(), void _q_replyErrors(QNetworkReply::NetworkError))
 -
  #ifndef QT_NO_BEARERMANAGEMENT
@@ -44,9 +44,9 @@ Index: qtbase-opensource-src-5.4.1+dfsg/src/network/access/qnetworkaccessmanager
 --- 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_replyPreSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator *authenticator);
 -    void _q_replyErrors(QNetworkReply::NetworkError);
  
      QNetworkReply *postProcess(QNetworkReply *reply);

-- 
qtbase packaging