From 1372764ead6ef44d9319cd018ce8882695df5cae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Fri, 1 Nov 2024 10:40:18 +0100 Subject: [PATCH] Tests: initialize WinSock to v2.2 Change-Id: I3f2652e6a7ce39cbc85fe7381d2a871609c8350c Reviewed-by: Giuseppe D'Angelo --- tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp | 2 +- .../network_remote_stresstest/tst_network_remote_stresstest.cpp | 2 +- tests/manual/network_stresstest/tst_network_stresstest.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp index 63932c310ba..e40ec0a51fc 100644 --- a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp +++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp @@ -517,7 +517,7 @@ void tst_QTcpServer::setSocketDescriptor() #ifdef Q_OS_WIN // ensure winsock is started WSADATA wsaData; - QVERIFY(WSAStartup(MAKEWORD(2,0), &wsaData) == NO_ERROR); + QVERIFY(WSAStartup(MAKEWORD(2, 2), &wsaData) == NO_ERROR); #endif SOCKET sock = ::socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); diff --git a/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp b/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp index fd4e62c92b8..2feaa9324d7 100644 --- a/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp +++ b/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp @@ -75,7 +75,7 @@ tst_NetworkRemoteStressTest::tst_NetworkRemoteStressTest() WSAData wsadata; // IPv6 requires Winsock v2.0 or better. - WSAStartup(MAKEWORD(2,0), &wsadata); + WSAStartup(MAKEWORD(2, 2), &wsadata); #elif defined(Q_OS_UNIX) ::signal(SIGALRM, SIG_IGN); #endif diff --git a/tests/manual/network_stresstest/tst_network_stresstest.cpp b/tests/manual/network_stresstest/tst_network_stresstest.cpp index 5796dd8e771..1b0f8d5d4f3 100644 --- a/tests/manual/network_stresstest/tst_network_stresstest.cpp +++ b/tests/manual/network_stresstest/tst_network_stresstest.cpp @@ -82,7 +82,7 @@ tst_NetworkStressTest::tst_NetworkStressTest() WSAData wsadata; // IPv6 requires Winsock v2.0 or better. - WSAStartup(MAKEWORD(2,0), &wsadata); + WSAStartup(MAKEWORD(2, 2), &wsadata); #elif defined(Q_OS_UNIX) ::signal(SIGALRM, SIG_IGN); #endif