summaryrefslogtreecommitdiffstats
path: root/src/network/CMakeLists.txt
diff options
context:
space:
mode:
authorLeander Beernaert <leander.beernaert@qt.io>2019-06-04 10:58:55 +0200
committerLeander Beernaert <leander.beernaert@qt.io>2019-06-04 10:17:35 +0000
commitff68d84d3202d810efefeaebca2835cac4e05b4f (patch)
tree11437fd495b4bd5d5828dbcb130864cf48cd6e9f /src/network/CMakeLists.txt
parent5c954b89a9bd94b085a49d05dfa25644b2eda1c8 (diff)
Android: Fix incorrect build config for Network
Fix build configuration for qdnslookup implementations for android as UNIX is also set when building for Android. We should only have the more specific conditions enabled. Change-Id: Ib891df34e5569a20b03ce270e1eab080325549b9 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/network/CMakeLists.txt')
-rw-r--r--src/network/CMakeLists.txt9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
index 414a41581b..4a642835b6 100644
--- a/src/network/CMakeLists.txt
+++ b/src/network/CMakeLists.txt
@@ -151,7 +151,7 @@ extend_target(Network CONDITION UNIX
socket/qnet_unix_p.h
)
-extend_target(Network CONDITION QT_FEATURE_dnslookup AND UNIX AND NOT INTEGRITY
+extend_target(Network CONDITION QT_FEATURE_dnslookup AND UNIX AND NOT INTEGRITY AND NOT ANDROID
SOURCES
kernel/qdnslookup_unix.cpp
)
@@ -161,12 +161,6 @@ extend_target(Network CONDITION QT_FEATURE_dlopen AND UNIX
${CMAKE_DL_LIBS}
)
-# special case begin
-# Do not add this to android!
-extend_target(Network CONDITION QT_FEATURE_dnslookup AND UNIX AND NOT INTEGRITY AND NOT ANDROID
- SOURCES
- kernel/qdnslookup_unix.cpp
-)
# special case end
extend_target(Network CONDITION QT_FEATURE_linux_netlink AND UNIX
@@ -181,7 +175,6 @@ extend_target(Network CONDITION UNIX AND NOT QT_FEATURE_linux_netlink
extend_target(Network CONDITION ANDROID AND QT_FEATURE_dnslookup
SOURCES
- # kernel/qdnslookup_unix.cpp # special case: No more need to remove this
kernel/qdnslookup_android.cpp
)