From 233f2340bd164bf080e95ef4aade267a7eb94e22 Mon Sep 17 00:00:00 2001 From: Juha Vuolle Date: Thu, 17 Apr 2025 08:15:50 +0300 Subject: [PATCH] Fix namespace build when networkproxy is disabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The QT_BEGIN_NAMESPACE macro was inside the "#if networkproxy" code block, whereas the QT_END_NAMESPACE was outside of it. When networkproxy feature is then disabled, the file will only effectively have the QT_END_NAMESPACE macro. This fails to compile when the build is an actual namespace build. Pick-to: 6.8 Change-Id: Ic0b0fd2d086811664a4f66e2c46424d370641355 Reviewed-by: Tor Arne Vestbø (cherry picked from commit 8d659669b248908b28dd51d07054cbb1ce91a35a) Reviewed-by: Qt Cherry-pick Bot --- src/network/kernel/qnetworkproxy_darwin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network/kernel/qnetworkproxy_darwin.cpp b/src/network/kernel/qnetworkproxy_darwin.cpp index d2bd4958ddc..0eac65c96fd 100644 --- a/src/network/kernel/qnetworkproxy_darwin.cpp +++ b/src/network/kernel/qnetworkproxy_darwin.cpp @@ -371,6 +371,6 @@ QList QNetworkProxyFactory::systemProxyForQuery(const QNetworkPro return result; } -#endif - QT_END_NAMESPACE + +#endif // QT_NO_NETWORKPROXY