diff options
Diffstat (limited to 'src/network/configure.cmake')
-rw-r--r-- | src/network/configure.cmake | 62 |
1 files changed, 36 insertions, 26 deletions
diff --git a/src/network/configure.cmake b/src/network/configure.cmake index 9d3bd33501..cda444b873 100644 --- a/src/network/configure.cmake +++ b/src/network/configure.cmake @@ -12,7 +12,7 @@ qt_find_package(Libproxy PROVIDED_TARGETS PkgConfig::Libproxy MODULE_NAME networ qt_find_package(GSSAPI PROVIDED_TARGETS GSSAPI::GSSAPI MODULE_NAME network QMAKE_LIB gssapi) qt_find_package(GLIB2 OPTIONAL_COMPONENTS GOBJECT PROVIDED_TARGETS GLIB2::GOBJECT MODULE_NAME core QMAKE_LIB gobject) qt_find_package(GLIB2 OPTIONAL_COMPONENTS GIO PROVIDED_TARGETS GLIB2::GIO MODULE_NAME core QMAKE_LIB gio) - +qt_find_package(WrapResolv PROVIDED_TARGETS WrapResolv::WrapResolv MODULE_NAME network QMAKE_LIB libresolv) #### Tests @@ -37,22 +37,6 @@ freeifaddrs(list); "# FIXME: use: unmapped library: network ) -# ifr_index -qt_config_compile_test(ifr_index - LABEL "ifr_index" - CODE -"#include <net/if.h> - -int main(void) -{ - /* BEGIN TEST: */ -struct ifreq req; -req.ifr_index = 0; - /* END TEST: */ - return 0; -} -") - # ipv6ifname qt_config_compile_test(ipv6ifname LABEL "IPv6 ifname" @@ -100,6 +84,25 @@ ci.ifa_prefered = ci.ifa_valid = 0; } ") +# res_setserver +qt_config_compile_test(res_setservers + LABEL "res_setservers()" + LIBRARIES + WrapResolv::WrapResolv + CODE +"#include <sys/types.h> +#include <netinet/in.h> +#include <resolv.h> +int main() +{ + union res_sockaddr_union sa; + res_state s = nullptr; + res_setservers(s, &sa, 1); + return 0; +} +" +) + # sctp qt_config_compile_test(sctp LABEL "SCTP support" @@ -166,6 +169,7 @@ qt_config_compile_test(networklistmanager LABEL "Network List Manager" CODE "#include <netlistmgr.h> +#include <ocidl.h> #include <wrl/client.h> int main(void) @@ -189,18 +193,19 @@ connectionPointContainer->FindConnectionPoint(IID_INetworkConnectionEvents, &con qt_feature("getifaddrs" PUBLIC LABEL "getifaddrs()" - CONDITION TEST_getifaddrs + CONDITION VXWORKS OR UNIX AND NOT QT_FEATURE_linux_netlink AND TEST_getifaddrs ) qt_feature_definition("getifaddrs" "QT_NO_GETIFADDRS" NEGATE VALUE "1") -qt_feature("ifr_index" PRIVATE - LABEL "ifr_index" - CONDITION TEST_ifr_index -) qt_feature("ipv6ifname" PUBLIC LABEL "IPv6 ifname" - CONDITION TEST_ipv6ifname + CONDITION VXWORKS OR UNIX AND NOT QT_FEATURE_linux_netlink AND TEST_ipv6ifname ) qt_feature_definition("ipv6ifname" "QT_NO_IPV6IFNAME" NEGATE VALUE "1") +qt_feature("libresolv" PRIVATE + LABEL "libresolv" + CONDITION WrapResolv_FOUND + AUTODETECT UNIX +) qt_feature("libproxy" PRIVATE LABEL "libproxy" AUTODETECT OFF @@ -210,6 +215,10 @@ qt_feature("linux-netlink" PRIVATE LABEL "Linux AF_NETLINK" CONDITION LINUX AND NOT ANDROID AND TEST_linux_netlink ) +qt_feature("res_setservers" PRIVATE + LABEL "res_setservers()" + CONDITION QT_FEATURE_libresolv AND TEST_res_setservers +) qt_feature("securetransport" PUBLIC LABEL "SecureTransport" CONDITION APPLE @@ -306,7 +315,7 @@ qt_feature("dnslookup" PUBLIC SECTION "Networking" LABEL "QDnsLookup" PURPOSE "Provides API for DNS lookups." - CONDITION NOT INTEGRITY + CONDITION QT_FEATURE_thread AND NOT INTEGRITY ) qt_feature("gssapi" PUBLIC SECTION "Networking" @@ -330,8 +339,9 @@ qt_feature("networklistmanager" PRIVATE ) qt_feature("topleveldomain" PUBLIC SECTION "Networking" - LABEL "qTopLevelDomain()" - PURPOSE "Provides support for extracting the top level domain from URLs. If enabled, a binary dump of the Public Suffix List (http://www.publicsuffix.org, Mozilla License) is included. The data is then also used in QNetworkCookieJar::validateCookie." + LABEL "qIsEffectiveTLD()" + PURPOSE "Provides support for checking if a domain is a top level domain. If enabled, a binary dump of the Public Suffix List (http://www.publicsuffix.org, Mozilla License) is included. The data is used in QNetworkCookieJar." + AUTODETECT NOT WASM DISABLE INPUT_publicsuffix STREQUAL "no" ) qt_feature("publicsuffix-qt" PRIVATE |