summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Blechmann <[email protected]>2025-05-03 08:49:49 +0200
committerTim Blechmann <[email protected]>2025-05-04 08:31:09 +0200
commit7d9b930b6fbb56e9c4a848b54af2db6b58926440 (patch)
tree4c756c23f1074dcec42f379f1fb10916d3aeae75
parent86d93cc349ca9f1205f5e48bdf3d6d16a935118f (diff)
QSocks5SocketEngine: avoid interface as parameter name
`interface` is used by win32 headers. avoiding it fixes unity builds on windows. Pick-to: 6.8 6.9 Change-Id: I85c05e70f4986f2f384850458f7a460baacf6baf Reviewed-by: Thiago Macieira <[email protected]>
-rw-r--r--src/network/socket/qsocks5socketengine_p.h4
1 files 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