[SCM] qtwebsockets packaging branch, experimental, updated. debian/5.5.1-4-5-g4972633

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit ceecebb7d4c3611c8be6927e30064a8c8555d298
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Mar 22 22:38:25 2016 +0100

    Drop qtry_compare.patch, applied upstream.
---
 debian/changelog                  |  1 +
 debian/patches/qtry_compare.patch | 28 ----------------------------
 debian/patches/series             |  1 -
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e720d6d..92e9f57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtwebsockets-opensource-src (5.6.0-1) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * New upstream release.
+  * Drop qtry_compare.patch, applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 22 Mar 2016 22:37:27 +0100
 
diff --git a/debian/patches/qtry_compare.patch b/debian/patches/qtry_compare.patch
deleted file mode 100644
index 99750d3..0000000
--- a/debian/patches/qtry_compare.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: use QTRY_COMPARE where needed to add 5-seconds timeout
-Origin: upstream, http://code.qt.io/cgit/qt/qtwebsockets.git/commit/?id=a5cb3b8ff10fcf1d
- The second hunk is proposed by Liang Qi in https://codereview.qt-project.org/138251,
- pending review.
-Last-Update: 2015-10-19
-
---- a/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp
-+++ b/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp
-@@ -573,9 +573,7 @@
- 
-     socket.open(QUrl(QStringLiteral("ws://someserver.on.mars:9999")));
- 
--    if (errorSpy.count() == 0)
--        errorSpy.wait(500);
--    QCOMPARE(errorSpy.count(), 1);
-+    QTRY_COMPARE(errorSpy.count(), 1);
-     QList<QVariant> arguments = errorSpy.takeFirst();
-     QAbstractSocket::SocketError socketError =
-             qvariant_cast<QAbstractSocket::SocketError>(arguments.at(0));
-@@ -668,7 +666,7 @@
- 
-     socket->asyncClose();
- 
--    QCOMPARE(timer.isActive(), false);
-+    QTRY_COMPARE_WITH_TIMEOUT(loop.isRunning(), false, 200);
-     QCOMPARE(socket->receivedMessage, textMessage);
- 
-     socket->deleteLater();
diff --git a/debian/patches/series b/debian/patches/series
index 6bbd82b..02c4e42 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 disable_qml_tests.patch
-qtry_compare.patch

-- 
qtwebsockets packaging