From 5083ab72c79ca712584d9627347779e25a824a26 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 27 Jan 2023 19:20:14 +0100 Subject: [PATCH] QtNetwork/Windows: Add exclusions for CMake Unity (Jumbo) builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The "interface" define in windows.h causes clashes with variables named "interface". It cannot be undef'ed since the winsock headers also uses it. Task-number: QTBUG-109394 Change-Id: Id2daedfd6c57aae39a1fdfe92482f17884b68ef5 Reviewed-by: Timur Pocheptsov Reviewed-by: Mårten Nordheim (cherry picked from commit 0fc1f8174f3a899d3c3ee969596a0ad260a7bb8e) Reviewed-by: Qt Cherry-pick Bot --- src/network/CMakeLists.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 20a8280c6dd..2c59f18d81a 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -367,6 +367,25 @@ qt_internal_extend_target(Network CONDITION QNX PUBLIC_LIBRARIES socket) # speci qt_internal_extend_target(Network CONDITION SOLARIS PUBLIC_LIBRARIES socket nsl) # special case +if (WIN32) + set_source_files_properties(Network # include windows.h (causing clashes with "interface" define) + kernel/qauthenticator.cpp + kernel/qdnslookup_win.cpp + kernel/qhostaddress.cpp + kernel/qhostinfo.cpp + kernel/qhostinfo_win.cpp + kernel/qnetconmonitor_win.cpp + kernel/qnetworkinterface_win.cpp + kernel/qnetworkproxy_win.cpp + socket/qabstractsocket.cpp + socket/qlocalserver.cpp + socket/qlocalserver_win.cpp + socket/qlocalsocket_win.cpp + socket/qnativesocketengine.cpp + socket/qnativesocketengine_win.cpp + PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON) +endif() + # include the snippet projects for developer-builds if(QT_FEATURE_private_tests) add_subdirectory(doc/snippets/network)