diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-10-01 11:44:18 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-10-01 17:50:53 +0000 |
| commit | 627816ee876b8ba79ebdce69282be71df257c347 (patch) | |
| tree | 3b30d933387b994fa795a608e75748fa95ae4d61 /src | |
| parent | ff74ed711d2c1e0898705b1414c5f1c686efc64a (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.
Change-Id: If086da51ca343f598eb273236e7b6338f5da1e97
Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit b88095e644d0845e4532edf0ccdbca3a33a68c08)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -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 1ab3c20cc8..144be8c725 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -346,7 +346,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" |