whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Leander Beernaert 2019-06-04 10:58:55 +02:00
parent 5c954b89a9
commit ff68d84d32
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/network/CMakeLists.txt
View File

@ -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
)