From 2d0f73856a83b53e05dd639e52d06b9dbd702819 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Thu, 17 Nov 2022 19:38:53 +0100 Subject: [PATCH] Disable openslv(11|30) if -no-openssl is passed to configure Otherwise certain features may act as enabled even though they're not supposed to be Pick-to: 6.4 Fixes: QTBUG-108611 Change-Id: Id4b4bcb7a8f437e2d12b2a2f9b3ce2d4463b8be8 Reviewed-by: Alexey Edelev --- configure.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.cmake b/configure.cmake index c9d3967d8a..95995a558d 100644 --- a/configure.cmake +++ b/configure.cmake @@ -1086,10 +1086,12 @@ qt_feature_definition("openssl-linked" "QT_LINKED_OPENSSL") qt_feature("opensslv11" PUBLIC LABEL "OpenSSL 1.1" CONDITION TEST_opensslv11 OR TEST_opensslv11_headers + DISABLE INPUT_openssl STREQUAL 'no' OR INPUT_ssl STREQUAL 'no' ) qt_feature("opensslv30" PUBLIC LABEL "OpenSSL 3.0" CONDITION TEST_opensslv30 OR TEST_opensslv30_headers + DISABLE INPUT_openssl STREQUAL 'no' OR INPUT_ssl STREQUAL 'no' ) qt_feature("ccache" LABEL "Using ccache"