From da9d60ecc32263eaf77882811d58fefad9f85dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Wed, 17 Aug 2022 15:11:58 +0200 Subject: Make sockets' accept() methods return qintptr Not necessarily relevant outside windows, where the socket descriptor is SOCKET (= unsigned 64-bit). Also follow their recommendation to not compare to -1, but rather to INVALID_SOCKET. Pick-to: 6.4 6.3 6.2 Change-Id: I0cfa4dfd9e147469132e2e72de22b30eab01e15c Reviewed-by: Qt CI Bot Reviewed-by: Thiago Macieira --- src/network/socket/qhttpsocketengine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/network/socket/qhttpsocketengine.cpp') diff --git a/src/network/socket/qhttpsocketengine.cpp b/src/network/socket/qhttpsocketengine.cpp index 260484aaf3..6f93685d2a 100644 --- a/src/network/socket/qhttpsocketengine.cpp +++ b/src/network/socket/qhttpsocketengine.cpp @@ -164,7 +164,7 @@ bool QHttpSocketEngine::listen(int backlog) return false; } -int QHttpSocketEngine::accept() +qintptr QHttpSocketEngine::accept() { qWarning("Operation is not supported"); setError(QAbstractSocket::UnsupportedSocketOperationError, "Unsupported socket operation"_L1); -- cgit v1.2.3