summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/socket/qtcpsocket
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/network/socket/qtcpsocket')
-rw-r--r--tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp3
-rw-r--r--tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp7
2 files changed, 6 insertions, 4 deletions
diff --git a/tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp b/tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp
index 407d244f15..ed61db1a13 100644
--- a/tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp
+++ b/tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp
@@ -47,7 +47,8 @@ void My4Socket::read(void)
{
QDataStream in(this);
- quint32 num, reply;
+ quint32 num = 0;
+ quint32 reply = 0;
while (bytesAvailable()) {
in >> num;
diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
index fb6b0c6e32..9fd5620cec 100644
--- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
@@ -603,7 +603,7 @@ void tst_QTcpSocket::bind()
if (port)
QCOMPARE(int(boundPort), port);
fd = socket->socketDescriptor();
- QVERIFY(fd != INVALID_SOCKET);
+ QVERIFY(fd != qintptr(INVALID_SOCKET));
} else {
QVERIFY(!socket->bind(addr, port));
QCOMPARE(socket->localPort(), quint16(0));
@@ -667,7 +667,7 @@ void tst_QTcpSocket::bindThenResolveHost()
QCOMPARE(socket->state(), QAbstractSocket::BoundState);
quint16 boundPort = socket->localPort();
qintptr fd = socket->socketDescriptor();
- QVERIFY(fd != INVALID_SOCKET);
+ QVERIFY(fd != quint16(INVALID_SOCKET));
dummySocket.close();
@@ -2251,7 +2251,8 @@ void tst_QTcpSocket::abortiveClose()
enterLoop(10);
QVERIFY(server.hasPendingConnections());
- QVERIFY(tmpSocket = server.nextPendingConnection());
+ tmpSocket = server.nextPendingConnection();
+ QVERIFY(tmpSocket != nullptr);
qRegisterMetaType<QAbstractSocket::SocketError>("QAbstractSocket::SocketError");
QSignalSpy readyReadSpy(clientSocket, SIGNAL(readyRead()));