From 40d4ea3dcfd9599610815d8e1279f34a055a198c Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Sat, 3 May 2025 08:49:49 +0200 Subject: [PATCH] QSocks5SocketEngine: avoid interface as parameter name `interface` is used by win32 headers. avoiding it fixes unity builds on windows. Pick-to: 6.8 Change-Id: I85c05e70f4986f2f384850458f7a460baacf6baf Reviewed-by: Thiago Macieira (cherry picked from commit 7d9b930b6fbb56e9c4a848b54af2db6b58926440) Reviewed-by: Qt Cherry-pick Bot --- src/network/socket/qsocks5socketengine_p.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network/socket/qsocks5socketengine_p.h b/src/network/socket/qsocks5socketengine_p.h index 3a169812df8..03973662c4d 100644 --- a/src/network/socket/qsocks5socketengine_p.h +++ b/src/network/socket/qsocks5socketengine_p.h @@ -59,9 +59,9 @@ public: #ifndef QT_NO_UDPSOCKET #ifndef QT_NO_NETWORKINTERFACE bool joinMulticastGroup(const QHostAddress &groupAddress, - const QNetworkInterface &interface) override; + const QNetworkInterface &iface) override; bool leaveMulticastGroup(const QHostAddress &groupAddress, - const QNetworkInterface &interface) override; + const QNetworkInterface &iface) override; QNetworkInterface multicastInterface() const override; bool setMulticastInterface(const QNetworkInterface &iface) override; #endif // QT_NO_NETWORKINTERFACE