diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2020-05-04 15:03:09 +0200 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2020-06-16 11:06:42 +0200 |
| commit | 68387e485c954d6db2cf423723883a0b6dae222c (patch) | |
| tree | 41f6ca9b2be639f815156967c5a8a2c276e31e67 /src/network/CMakeLists.txt | |
| parent | d979f0a8c8cecb37d731c00d128627f711a83ce0 (diff) | |
Android: Add support for proxies
Pick-to: 5.15
Fixes: QTBUG-78812
Change-Id: Id1f35a5e4ca3d8841edae378df69b65ef599c1ca
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/network/CMakeLists.txt')
| -rw-r--r-- | src/network/CMakeLists.txt | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 0aff359750..b0d18fab0a 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -238,11 +238,22 @@ qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND UNIX AND NOT MACOS PkgConfig::Libproxy ) -qt_extend_target(Network CONDITION UNIX AND NOT MACOS AND NOT QT_FEATURE_libproxy +qt_extend_target(Network CONDITION ANDROID + SOURCES + kernel/qnetworkproxy_android.cpp +) + +qt_extend_target(Network CONDITION UNIX AND NOT ANDROID AND NOT MACOS 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/QtAndroidNetwork.jar + ) +endif() + qt_extend_target(Network CONDITION QT_FEATURE_socks5 SOURCES socket/qsocks5socketengine.cpp socket/qsocks5socketengine_p.h |