summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2020-08-28 14:57:18 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2020-09-10 18:05:22 +0200
commitd7749308915df108ad1ce680ea86fe50726bd35e (patch)
tree43a962b638c55472f921b53ce212f88d18d9be26 /src/network
parent74c48f0864793ec1e3e0e62693a201f8cbb4a672 (diff)
CMake: Re-generate configure.cmake files
Change-Id: I9c325db8031e14cf2a2cfb49e5080e3043a0811a Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'src/network')
-rw-r--r--src/network/configure.cmake3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/network/configure.cmake b/src/network/configure.cmake
index e64a98415a..a6b98b6fad 100644
--- a/src/network/configure.cmake
+++ b/src/network/configure.cmake
@@ -428,7 +428,6 @@ qt_configure_add_summary_entry(ARGS "openssl-linked")
qt_configure_add_summary_entry(ARGS "opensslv11")
qt_configure_add_summary_entry(ARGS "dtls")
qt_configure_add_summary_entry(ARGS "ocsp")
-qt_configure_add_summary_entry(ARGS "ftp")
qt_configure_add_summary_entry(ARGS "sctp")
qt_configure_add_summary_entry(ARGS "system-proxies")
qt_configure_add_summary_entry(ARGS "gssapi")
@@ -437,7 +436,7 @@ qt_configure_end_summary_section() # end of "Qt Network" section
qt_configure_add_report_entry(
TYPE NOTE
MESSAGE "When linking against OpenSSL, you can override the default library names through OPENSSL_LIBS. For example: OPENSSL_LIBS='-L/opt/ssl/lib -lssl -lcrypto' ./configure -openssl-linked"
- CONDITION NOT ANDROID AND QT_FEATURE_openssl_linked AND TEST_openssl.source NOT = 0 AND INPUT_openssl.prefix STREQUAL '' AND INPUT_openssl.libs STREQUAL '' AND INPUT_openssl.libs.debug STREQUAL '' OR FIXME
+ CONDITION NOT ANDROID AND QT_FEATURE_openssl_linked AND ( NOT TEST_openssl.source EQUAL 0 ) AND INPUT_openssl.prefix STREQUAL '' AND INPUT_openssl.libs STREQUAL '' AND INPUT_openssl.libs.debug STREQUAL '' OR FIXME
)
qt_configure_add_report_entry(
TYPE WARNING