[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.6.1+dfsg-3ubuntu2-10-ge76670e

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit 6e1a2d1d9a7b09b3b22c1d316cebafc942c284b3
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Wed Mar 9 14:56:00 2016 +0000

    Rebase qnam-ubuntu-fix6.patch.
---
 debian/changelog                      |  1 +
 debian/patches/qnam-ubuntu-fix6.patch | 31 +++++--------------------------
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 954dafb..dde5947 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtbase-opensource-src (5.6.0~rc+dfsg-1ubuntu1) UNRELEASED; urgency=medium
   * Migrate symbols using the script to the Qt_5 versioning scheme.
   * Update symbols and bump symbols abi.
   * Rebase and refresh enable-tests.patch.
+  * Rebase qnam-ubuntu-fix6.patch.
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Mon, 18 Jan 2016 10:06:17 +0000
 
diff --git a/debian/patches/qnam-ubuntu-fix6.patch b/debian/patches/qnam-ubuntu-fix6.patch
index f71ca2e..0fb4ce3 100644
--- a/debian/patches/qnam-ubuntu-fix6.patch
+++ b/debian/patches/qnam-ubuntu-fix6.patch
@@ -276,7 +276,7 @@ Index: qtbase-opensource-src-5.4.1+dfsg/src/network/access/qnetworkreplyhttpimpl
 +            QObject::connect(networkSession.data(), SIGNAL(stateChanged(QNetworkSession::State)),
 +                             q, SLOT(_q_networkSessionStateChanged(QNetworkSession::State)), Qt::QueuedConnection);
 +
-         postRequest();
+         postRequest(newHttpRequest);
          return true;
      } else if (synchronous) {
 @@ -1648,7 +1653,7 @@ void QNetworkReplyHttpImplPrivate::_q_st
@@ -288,19 +288,6 @@ Index: qtbase-opensource-src-5.4.1+dfsg/src/network/access/qnetworkreplyhttpimpl
                  session->open();
              }
          } else {
-@@ -1669,8 +1674,10 @@ void QNetworkReplyHttpImplPrivate::_q_st
- #endif
-     } else {
- #ifndef QT_NO_BEARERMANAGEMENT
--        QObject::connect(session.data(), SIGNAL(stateChanged(QNetworkSession::State)),
--                         q, SLOT(_q_networkSessionStateChanged(QNetworkSession::State)), Qt::QueuedConnection);
-+        if (session) {
-+            QObject::connect(session.data(), SIGNAL(stateChanged(QNetworkSession::State)),
-+                             q, SLOT(_q_networkSessionStateChanged(QNetworkSession::State)), Qt::QueuedConnection);
-+        }
- #endif
-     }
- 
 @@ -1811,6 +1818,7 @@ void QNetworkReplyHttpImplPrivate::_q_bu
  #ifndef QT_NO_BEARERMANAGEMENT
  void QNetworkReplyHttpImplPrivate::_q_networkSessionConnected()
@@ -319,14 +306,6 @@ Index: qtbase-opensource-src-5.4.1+dfsg/src/network/access/qnetworkreplyhttpimpl
              && (state != Idle || state != Reconnecting)) {
          error(QNetworkReplyImpl::NetworkSessionFailedError,
                QCoreApplication::translate("QNetworkReply", "Network session error."));
-@@ -1970,7 +1979,6 @@ void QNetworkReplyHttpImplPrivate::finis
-         }
- #endif
-     }
--
-     state = Finished;
-     q->setFinished(true);
- 
 Index: qtbase-opensource-src-5.4.1+dfsg/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
 ===================================================================
 --- qtbase-opensource-src-5.4.1+dfsg.orig/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
@@ -608,7 +587,7 @@ Index: qtbase-opensource-src-5.4.1+dfsg/src/plugins/bearer/networkmanager/qnetwo
          i.next();
          propertyMap.insert(i.key(),i.value());
 -
--        if (i.key() == QStringLiteral("State")) {
+-        if (i.key() == QLatin1String("State")) {
 -            quint32 state = i.value().toUInt();
 -            if (state == NM_DEVICE_STATE_ACTIVATED
 -                || state == NM_DEVICE_STATE_DISCONNECTED
@@ -617,7 +596,7 @@ Index: qtbase-opensource-src-5.4.1+dfsg/src/plugins/bearer/networkmanager/qnetwo
 -                Q_EMIT propertiesChanged(map);
 -                Q_EMIT stateChanged(state);
 -            }
--        } else if (i.key() == QStringLiteral("ActiveConnections")) {
+-        } else if (i.key() == QLatin1String("ActiveConnections")) {
 -            Q_EMIT propertiesChanged(map);
 -        }
      }
@@ -639,7 +618,7 @@ Index: qtbase-opensource-src-5.4.1+dfsg/src/plugins/bearer/networkmanager/qnetwo
      QMapIterator<QString, QVariant> i(map);
      while (i.hasNext()) {
          i.next();
--        if (i.key() == QStringLiteral("AvailableConnections")) { //Device
+-        if (i.key() == QLatin1String("AvailableConnections")) { //Device
 -            const QDBusArgument &dbusArgs = i.value().value<QDBusArgument>();
 -            QDBusObjectPath path;
 -            QStringList paths;
@@ -691,7 +670,7 @@ Index: qtbase-opensource-src-5.4.1+dfsg/src/plugins/bearer/networkmanager/qnetwo
      while (i.hasNext()) {
          i.next();
          propertyMap.insert(i.key(),i.value());
--        if (i.key() == QStringLiteral("State")) {
+-        if (i.key() == QLatin1String("State")) {
 -            quint32 state = i.value().toUInt();
 -            if (state == NM_ACTIVE_CONNECTION_STATE_ACTIVATED
 -                || state == NM_ACTIVE_CONNECTION_STATE_DEACTIVATED) {

-- 
qtbase packaging