diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-10-01 11:44:18 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-10-01 18:51:07 +0200 |
| commit | b88095e644d0845e4532edf0ccdbca3a33a68c08 (patch) | |
| tree | 4567b1fed2f58bcd0162e7f5f783e2ef57300821 | |
| parent | 51e8d3592acc8bacf326fe3933b5dec13bb518e6 (diff) | |
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 <tatiana.borisova@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | src/network/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/network/configure.cmake | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 7c587b5c209..4a566520c44 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 9e2cb41c3bd..acd90900464 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" |