1 files changed, 66 insertions, 49 deletions
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
index 69043b006a..e977400245 100644
--- a/src/network/CMakeLists.txt
+++ b/src/network/CMakeLists.txt
@@ -20,12 +20,15 @@ qt_internal_add_module(Network
         access/qnetworkcookie.cpp access/qnetworkcookie.h access/qnetworkcookie_p.h
         access/qnetworkcookiejar.cpp access/qnetworkcookiejar.h access/qnetworkcookiejar_p.h
         access/qnetworkfile.cpp access/qnetworkfile_p.h
+        access/qhttpheaders.cpp access/qhttpheaders.h
         access/qhttpheaderparser.cpp access/qhttpheaderparser_p.h
+        access/qhttpheadershelper.cpp access/qhttpheadershelper_p.h
         access/qnetworkreply.cpp access/qnetworkreply.h access/qnetworkreply_p.h
         access/qnetworkreplydataimpl.cpp access/qnetworkreplydataimpl_p.h
         access/qnetworkreplyfileimpl.cpp access/qnetworkreplyfileimpl_p.h
         access/qnetworkreplyimpl.cpp access/qnetworkreplyimpl_p.h
         access/qnetworkrequest.cpp access/qnetworkrequest.h access/qnetworkrequest_p.h
+        compat/removed_api.cpp
         kernel/qauthenticator.cpp kernel/qauthenticator.h kernel/qauthenticator_p.h
         kernel/qhostaddress.cpp kernel/qhostaddress.h kernel/qhostaddress_p.h
         kernel/qhostinfo.cpp kernel/qhostinfo.h kernel/qhostinfo_p.h
@@ -53,8 +56,14 @@ qt_internal_add_module(Network
         ssl/qsslsocket.h
         ssl/qtlsbackend.cpp ssl/qtlsbackend_p.h
     DEFINES
+        QT_NO_CONTEXTLESS_CONNECT
         QT_NO_FOREACH
         QT_NO_USING_NAMESPACE
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+        QT_NO_CAST_FROM_BYTEARRAY
+        QT_NO_URL_CAST_FROM_STRING
+        QT_USE_NODISCARD_FILE_OPEN
     INCLUDE_DIRECTORIES
         kernel
     LIBRARIES
@@ -63,10 +72,11 @@ qt_internal_add_module(Network
         Qt::Core
     PRIVATE_MODULE_INTERFACE
         Qt::CorePrivate
+    NO_PCH_SOURCES
+        compat/removed_api.cpp
     PRECOMPILED_HEADER
         "../corelib/global/qt_pch.h"
     GENERATE_CPP_EXPORTS
-    GENERATE_PRIVATE_CPP_EXPORTS
 )
 
 ## Scopes:
@@ -118,6 +128,7 @@ qt_internal_extend_target(Network CONDITION QT_FEATURE_http
         access/qdecompresshelper.cpp access/qdecompresshelper_p.h
         access/qhttp1configuration.cpp access/qhttp1configuration.h
         access/qhttp2configuration.cpp access/qhttp2configuration.h
+        access/qhttp2connection.cpp access/qhttp2connection_p.h
         access/qhttp2protocolhandler.cpp access/qhttp2protocolhandler_p.h
         access/qhttpmultipart.cpp access/qhttpmultipart.h access/qhttpmultipart_p.h
         access/qhttpnetworkconnection.cpp access/qhttpnetworkconnection_p.h
@@ -128,6 +139,11 @@ qt_internal_extend_target(Network CONDITION QT_FEATURE_http
         access/qhttpprotocolhandler.cpp access/qhttpprotocolhandler_p.h
         access/qhttpthreaddelegate.cpp access/qhttpthreaddelegate_p.h
         access/qnetworkreplyhttpimpl.cpp access/qnetworkreplyhttpimpl_p.h
+        access/qnetworkrequestfactory.cpp access/qnetworkrequestfactory_p.h
+        access/qnetworkrequestfactory.h
+        access/qrestaccessmanager.cpp access/qrestaccessmanager.h access/qrestaccessmanager_p.h
+        access/qrestreply.cpp access/qrestreply.h access/qrestreply_p.h
+        access/qsocketabstraction_p.h
         socket/qhttpsocketengine.cpp socket/qhttpsocketengine_p.h
 )
 
@@ -176,11 +192,6 @@ qt_internal_extend_target(Network CONDITION UNIX
         socket/qnet_unix_p.h
 )
 
-qt_internal_extend_target(Network CONDITION QT_FEATURE_dlopen AND UNIX
-    LIBRARIES
-        ${CMAKE_DL_LIBS}
-)
-
 qt_internal_extend_target(Network CONDITION QT_FEATURE_linux_netlink AND UNIX
     SOURCES
         kernel/qnetworkinterface_linux.cpp
@@ -191,11 +202,6 @@ qt_internal_extend_target(Network CONDITION UNIX AND NOT QT_FEATURE_linux_netlin
         kernel/qnetworkinterface_unix.cpp
 )
 
-qt_internal_extend_target(Network CONDITION ANDROID AND QT_FEATURE_dnslookup
-    SOURCES
-        kernel/qdnslookup_android.cpp
-)
-
 qt_internal_extend_target(Network CONDITION WIN32
     SOURCES
         kernel/qhostinfo_win.cpp
@@ -208,11 +214,8 @@ qt_internal_extend_target(Network CONDITION WIN32
         iphlpapi
         secur32
         winhttp
-)
-
-qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND WIN32
-    SOURCES
-        kernel/qdnslookup_win.cpp
+    DEFINES
+        NOMINMAX
 )
 
 qt_internal_extend_target(Network CONDITION APPLE AND NOT UIKIT
@@ -221,19 +224,29 @@ qt_internal_extend_target(Network CONDITION APPLE AND NOT UIKIT
         ${FWSystemConfiguration}
 )
 
-qt_internal_extend_target(Network CONDITION APPLE AND NOT UIKIT
+qt_internal_extend_target(Network CONDITION APPLE
     LIBRARIES
-        ${FWCoreServices}
-        ${FWSystemConfiguration}
+        ${FWCFNetwork}
 )
 
-qt_internal_extend_target(Network CONDITION APPLE
+qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND QT_FEATURE_libresolv
+    SOURCES
+        kernel/qdnslookup_unix.cpp
     LIBRARIES
-        ${FWCFNetwork}
+        WrapResolv::WrapResolv
+)
+
+qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND WIN32
+    SOURCES
+        kernel/qdnslookup_win.cpp
 )
 
+qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND NOT QT_FEATURE_libresolv AND NOT WIN32
+    SOURCES
+        kernel/qdnslookup_dummy.cpp
+)
 
-qt_internal_extend_target(Network CONDITION IOS OR MACOS
+qt_internal_extend_target(Network CONDITION APPLE
     SOURCES
         kernel/qnetconmonitor_darwin.mm
     LIBRARIES
@@ -245,7 +258,7 @@ qt_internal_extend_target(Network CONDITION QT_FEATURE_networklistmanager AND NO
         kernel/qnetconmonitor_win.cpp
 )
 
-qt_internal_extend_target(Network CONDITION NOT IOS AND NOT MACOS AND NOT QT_FEATURE_networklistmanager
+qt_internal_extend_target(Network CONDITION NOT APPLE AND NOT QT_FEATURE_networklistmanager
     SOURCES
         kernel/qnetconmonitor_stub.cpp
 )
@@ -260,7 +273,7 @@ qt_internal_extend_target(Network CONDITION UIKIT
         kernel/qnetworkinterface_uikit_p.h
 )
 
-qt_internal_extend_target(Network CONDITION APPLE
+qt_internal_extend_target(Network CONDITION APPLE AND NOT VISIONOS
     SOURCES
         kernel/qnetworkproxy_darwin.cpp
 )
@@ -278,7 +291,7 @@ qt_internal_extend_target(Network CONDITION ANDROID
         kernel/qnetworkproxy_android.cpp
 )
 
-qt_internal_extend_target(Network CONDITION UNIX AND NOT ANDROID AND NOT APPLE AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT)
+qt_internal_extend_target(Network CONDITION UNIX AND NOT ANDROID AND NOT (APPLE AND NOT VISIONOS) AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT)
     SOURCES
         kernel/qnetworkproxy_generic.cpp
 )
@@ -365,40 +378,44 @@ qt_internal_extend_target(Network CONDITION QT_FEATURE_ocsp AND QT_FEATURE_opens
         ssl/qocsp_p.h
 )
 
-qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND UNIX AND NOT ANDROID
-    SOURCES
-        kernel/qdnslookup_unix.cpp
-)
 qt_internal_add_docs(Network
     doc/qtnetwork.qdocconf
 )
 
-qt_internal_extend_target(Network CONDITION WIN32 PUBLIC_LIBRARIES ws2_32) # special case: mkspecs/common/msvc-desktop.conf
+# See mkspecs/common/msvc-desktop.conf
+qt_internal_extend_target(Network CONDITION WIN32 PUBLIC_LIBRARIES ws2_32)
 
-qt_internal_extend_target(Network CONDITION QNX PUBLIC_LIBRARIES socket) # special case: mkspecs/common/qcc-base-qnx.conf
+# See mkspecs/common/qcc-base-qnx.conf
+qt_internal_extend_target(Network CONDITION QNX PUBLIC_LIBRARIES socket)
 
 qt_internal_extend_target(Network CONDITION SOLARIS PUBLIC_LIBRARIES socket nsl)
 
-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()
+qt_internal_extend_target(Network CONDITION WIN32
+    NO_UNITY_BUILD_SOURCES
+        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
+)
 
 # include the snippet projects for developer-builds
 if(QT_FEATURE_private_tests)
     add_subdirectory(doc/snippets/network)
 endif()
+qt_internal_extend_target(Network
+    # Workaround for QTBUG-118229:
+    # Function called by inline methods taking a pointer to a private class as a parameter
+    EXTRA_LINKER_SCRIPT_EXPORTS
+        # QNetworkDatagram::destroy(QNetworkDatagramPrivate *d)
+        "_ZN*16QNetworkDatagram7destroyEP*23QNetworkDatagramPrivate*"
+)