[SCM] qtwebsockets packaging branch, master, updated. debian/5.3.2-5-2-g0e87340

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 0e8734087d91767631951d945c58e43ccb7ad91f
Author: Rohan Garg <rohan at garg.io>
Date:   Thu Mar 26 12:27:25 2015 +0100

    Revert "Refresh patch for Qt5 git"
    
    This reverts commit df520e508bfb12b2b1eb746a637c5e7d4183abd8.
---
 debian/patches/fix_kfreebsd_test.patch | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/debian/patches/fix_kfreebsd_test.patch b/debian/patches/fix_kfreebsd_test.patch
index 6afd90f..937d122 100644
--- a/debian/patches/fix_kfreebsd_test.patch
+++ b/debian/patches/fix_kfreebsd_test.patch
@@ -6,11 +6,9 @@ Bug-Qt: https://bugreports.qt-project.org/browse/QTBUG-41448
  tests/auto/qwebsocket/tst_qwebsocket.cpp |   31 ++++++++++++++++++++++++++++---
  1 file changed, 28 insertions(+), 3 deletions(-)
 
-Index: qtwebsockets/tests/auto/qwebsocket/tst_qwebsocket.cpp
-===================================================================
---- qtwebsockets.orig/tests/auto/qwebsocket/tst_qwebsocket.cpp
-+++ qtwebsockets/tests/auto/qwebsocket/tst_qwebsocket.cpp
-@@ -236,6 +236,7 @@ void tst_QWebSocket::tst_invalidOpen_dat
+--- a/tests/auto/qwebsocket/tst_qwebsocket.cpp
++++ b/tests/auto/qwebsocket/tst_qwebsocket.cpp
+@@ -246,6 +246,7 @@ void tst_QWebSocket::tst_invalidOpen_dat
      QTest::addColumn<QString>("expectedUrl");
      QTest::addColumn<QString>("expectedPeerName");
      QTest::addColumn<QString>("expectedResourceName");
@@ -18,7 +16,7 @@ Index: qtwebsockets/tests/auto/qwebsocket/tst_qwebsocket.cpp
      QTest::addColumn<QAbstractSocket::SocketState>("stateAfterOpenCall");
      QTest::addColumn<int>("disconnectedCount");
      QTest::addColumn<int>("stateChangedCount");
-@@ -243,18 +244,28 @@ void tst_QWebSocket::tst_invalidOpen_dat
+@@ -253,18 +254,28 @@ void tst_QWebSocket::tst_invalidOpen_dat
      QTest::newRow("Illegal local address")
              << QStringLiteral("ws://127.0.0.1:1/") << QStringLiteral("ws://127.0.0.1:1/")
              << QStringLiteral("127.0.0.1")
@@ -49,7 +47,7 @@ Index: qtwebsockets/tests/auto/qwebsocket/tst_qwebsocket.cpp
              << QAbstractSocket::UnconnectedState
              << 0 << 0;
  }
-@@ -265,6 +276,7 @@ void tst_QWebSocket::tst_invalidOpen()
+@@ -275,6 +286,7 @@ void tst_QWebSocket::tst_invalidOpen()
      QFETCH(QString, expectedUrl);
      QFETCH(QString, expectedPeerName);
      QFETCH(QString, expectedResourceName);
@@ -57,7 +55,7 @@ Index: qtwebsockets/tests/auto/qwebsocket/tst_qwebsocket.cpp
      QFETCH(QAbstractSocket::SocketState, stateAfterOpenCall);
      QFETCH(int, disconnectedCount);
      QFETCH(int, stateChangedCount);
-@@ -288,7 +300,8 @@ void tst_QWebSocket::tst_invalidOpen()
+@@ -298,7 +310,8 @@ void tst_QWebSocket::tst_invalidOpen()
      QCOMPARE(socket.version(), QWebSocketProtocol::VersionLatest);
      //at this point the socket is in a connecting state
      //so, there should no error at this point
@@ -67,7 +65,7 @@ Index: qtwebsockets/tests/auto/qwebsocket/tst_qwebsocket.cpp
      QVERIFY(!socket.errorString().isEmpty());
      QVERIFY(!socket.isValid());
      QVERIFY(socket.localAddress().isNull());
-@@ -355,7 +368,13 @@ void tst_QWebSocket::tst_invalidOrigin()
+@@ -365,7 +378,13 @@ void tst_QWebSocket::tst_invalidOrigin()
  
      //at this point the socket is in a connecting state
      //so, there should no error at this point
@@ -81,7 +79,7 @@ Index: qtwebsockets/tests/auto/qwebsocket/tst_qwebsocket.cpp
      QVERIFY(!socket.errorString().isEmpty());
      QVERIFY(!socket.isValid());
      QVERIFY(socket.localAddress().isNull());
-@@ -364,13 +383,19 @@ void tst_QWebSocket::tst_invalidOrigin()
+@@ -374,13 +393,19 @@ void tst_QWebSocket::tst_invalidOrigin()
      QVERIFY(socket.peerAddress().isNull());
      QCOMPARE(socket.peerPort(), quint16(0));
      QCOMPARE(socket.peerName(), QStringLiteral("127.0.0.1"));

-- 
qtwebsockets packaging