[SCM] qtwebsockets packaging branch, master, updated. debian/5.5.1-2-3-gee09b23

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit bb33a5d365b1be158853304671518f41ab31962e
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Oct 19 12:07:16 2015 +0300

    Add one more place to use QTRY_COMPARE.
    
    From https://codereview.qt-project.org/138251.
---
 debian/patches/qtry_compare.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/debian/patches/qtry_compare.patch b/debian/patches/qtry_compare.patch
index 7aeedbd..8340910 100644
--- a/debian/patches/qtry_compare.patch
+++ b/debian/patches/qtry_compare.patch
@@ -1,5 +1,7 @@
 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
@@ -15,3 +17,12 @@ Last-Update: 2015-10-19
      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();

-- 
qtwebsockets packaging