From ff68d84d3202d810efefeaebca2835cac4e05b4f Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Tue, 4 Jun 2019 10:58:55 +0200 Subject: [PATCH] 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 --- src/network/CMakeLists.txt | 9 +-------- 1 file changed, 1 insertion(+), 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 )