diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2023-01-18 12:51:23 +0100 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2023-01-30 20:10:25 +0100 |
| commit | f932be58d56dd58d9a6c6f33054a32261ec5a932 (patch) | |
| tree | 95173d98dd687e21e6a7df42e184495322479c04 /src/network/CMakeLists.txt | |
| parent | ade96ff6446d4b0977d4e5f03b96b77ff8223b8b (diff) | |
qnetworkproxy_mac: use API available both on iOS and macOS
To extract system proxies, the one we used previously, was not available
on iOS and thus we could not obtain system proxies there. Support is
limited - no such things, as SOCKS/FTP/etc. proxies, only PAC (auto
configuration), and HTTP/HTTPS. There are no keys to extract info
about HTTPS, so instead we'll use CFNetworkCopyProxiesForURL (
looks like this enables exclusion lists (which are hidden)
functionality and apparently from the system point of view HTTP/HTTPS
are the same.
Fixes: QTBUG-39869
Change-Id: I73af719a2e2b5cded706e6b3faa4b8eaa879352b
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/network/CMakeLists.txt')
| -rw-r--r-- | src/network/CMakeLists.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 20a8280c6d..61dc7784af 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -226,6 +226,18 @@ qt_internal_extend_target(Network CONDITION APPLE AND NOT UIKIT ${FWSystemConfiguration} ) +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 IOS OR MACOS SOURCES kernel/qnetconmonitor_darwin.mm @@ -253,9 +265,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 SOURCES - kernel/qnetworkproxy_mac.cpp + kernel/qnetworkproxy_darwin.cpp ) qt_internal_extend_target(Network CONDITION QT_FEATURE_libproxy AND UNIX AND NOT MACOS |