From b88095e644d0845e4532edf0ccdbca3a33a68c08 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 1 Oct 2021 11:44:18 +0200 Subject: [PATCH] Disable the dnslookup feature for INTEGRITY The QtNetwork project file excludes the dnslookup source files for Unix, despite the dnslookup feature is always on. This inconsistency leads to linker errors when building applications against QtNetwork: (error #412) unresolved symbols: 1 QDnsLookupRunnable::query(int, const QByteArray &, const QHostAddress &, QDnsLookupReply *) from libQt6Network.a(qdnslookup.cpp.o) Turn the feature off for INTEGRITY and remove the condition from the project file. Pick-to: 6.2 Change-Id: If086da51ca343f598eb273236e7b6338f5da1e97 Reviewed-by: Tatiana Borisova Reviewed-by: Alexandru Croitor --- src/network/CMakeLists.txt | 2 +- src/network/configure.cmake | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 7c587b5c20..4a566520c4 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -349,7 +349,7 @@ qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ss WrapOpenSSLHeaders::WrapOpenSSLHeaders ) -qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND UNIX AND NOT ANDROID AND NOT INTEGRITY +qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND UNIX AND NOT ANDROID SOURCES kernel/qdnslookup_unix.cpp ) diff --git a/src/network/configure.cmake b/src/network/configure.cmake index 9e2cb41c3b..acd9090046 100644 --- a/src/network/configure.cmake +++ b/src/network/configure.cmake @@ -374,6 +374,7 @@ qt_feature("dnslookup" PUBLIC SECTION "Networking" LABEL "QDnsLookup" PURPOSE "Provides API for DNS lookups." + CONDITION NOT INTEGRITY ) qt_feature("gssapi" PUBLIC SECTION "Networking"