diff options
Diffstat (limited to 'src/network/CMakeLists.txt')
-rw-r--r-- | src/network/CMakeLists.txt | 124 |
1 files changed, 87 insertions, 37 deletions
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 166559764a..e977400245 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -1,7 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -# Generated from network.pro. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## Network Module: @@ -22,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 @@ -40,7 +41,7 @@ qt_internal_add_module(Network kernel/qtnetworkglobal.h kernel/qtnetworkglobal_p.h socket/qabstractsocket.cpp socket/qabstractsocket.h socket/qabstractsocket_p.h socket/qabstractsocketengine.cpp socket/qabstractsocketengine_p.h - socket/qnativesocketengine.cpp socket/qnativesocketengine_p.h + socket/qnativesocketengine.cpp socket/qnativesocketengine_p.h socket/qnativesocketengine_p_p.h socket/qtcpserver.cpp socket/qtcpserver.h socket/qtcpserver_p.h socket/qtcpsocket.cpp socket/qtcpsocket.h socket/qtcpsocket_p.h socket/qudpsocket.cpp socket/qudpsocket.h @@ -55,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 @@ -65,15 +72,13 @@ 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 ) -#### Keys ignored in scope 1:.:.:network.pro:<TRUE>: -# QMAKE_LIBS = "$$QMAKE_LIBS_NETWORK" - ## Scopes: ##################################################################### @@ -121,7 +126,9 @@ qt_internal_extend_target(Network CONDITION QT_FEATURE_http access/http2/huffman.cpp access/http2/huffman_p.h access/qabstractprotocolhandler.cpp access/qabstractprotocolhandler_p.h 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 @@ -132,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 ) @@ -163,8 +175,9 @@ qt_internal_extend_target(Network CONDITION NOT QT_FEATURE_system_zlib AND NOT n qt_internal_extend_target(Network CONDITION QT_FEATURE_topleveldomain SOURCES kernel/qtldurl.cpp kernel/qtldurl_p.h - kernel/qurltlds_p.h ../3rdparty/libpsl/src/lookup_string_in_fixed_set.c + INCLUDE_DIRECTORIES + ../3rdparty/libpsl ) qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup @@ -179,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 @@ -194,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 @@ -211,6 +214,26 @@ qt_internal_extend_target(Network CONDITION WIN32 iphlpapi secur32 winhttp + DEFINES + NOMINMAX +) + +qt_internal_extend_target(Network CONDITION APPLE AND NOT UIKIT + LIBRARIES + ${FWCoreServices} + ${FWSystemConfiguration} +) + +qt_internal_extend_target(Network CONDITION APPLE + LIBRARIES + ${FWCFNetwork} +) + +qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND QT_FEATURE_libresolv + SOURCES + kernel/qdnslookup_unix.cpp + LIBRARIES + WrapResolv::WrapResolv ) qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND WIN32 @@ -218,13 +241,12 @@ qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND WIN32 kernel/qdnslookup_win.cpp ) -qt_internal_extend_target(Network CONDITION APPLE AND NOT UIKIT - LIBRARIES - ${FWCoreServices} - ${FWSystemConfiguration} +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 @@ -236,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 ) @@ -251,9 +273,9 @@ qt_internal_extend_target(Network CONDITION UIKIT kernel/qnetworkinterface_uikit_p.h ) -qt_internal_extend_target(Network CONDITION MACOS +qt_internal_extend_target(Network CONDITION APPLE AND NOT VISIONOS SOURCES - kernel/qnetworkproxy_mac.cpp + kernel/qnetworkproxy_darwin.cpp ) qt_internal_extend_target(Network CONDITION QT_FEATURE_libproxy AND UNIX AND NOT MACOS @@ -264,19 +286,19 @@ qt_internal_extend_target(Network CONDITION QT_FEATURE_libproxy AND UNIX AND NOT PkgConfig::Libproxy ) -qt_internal_extend_target(Network CONDITION ANDROID # special case +qt_internal_extend_target(Network CONDITION ANDROID SOURCES kernel/qnetworkproxy_android.cpp ) -qt_internal_extend_target(Network CONDITION UNIX AND NOT ANDROID AND NOT MACOS AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT) # special case +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 ) if(ANDROID AND (ANDROID)) set_property(TARGET Network APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES - jar/Qt${QtBase_VERSION_MAJOR}AndroidNetwork.jar # special case + jar/Qt${QtBase_VERSION_MAJOR}AndroidNetwork.jar ) endif() @@ -322,6 +344,11 @@ qt_internal_extend_target(Network CONDITION QT_FEATURE_localserver AND WIN32 socket/qlocalsocket_win.cpp ) +qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl_linked AND QT_FEATURE_opensslv30 + LIBRARIES + WrapOpenSSL::WrapOpenSSL +) + qt_internal_extend_target(Network CONDITION QT_FEATURE_system_proxies DEFINES QT_USE_SYSTEM_PROXIES @@ -351,21 +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) # special case +qt_internal_extend_target(Network CONDITION SOLARIS PUBLIC_LIBRARIES socket nsl) + +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*" +) |