From d55c5e2a4384038c1deb5066e48d29444f891ebc Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Wed, 9 Aug 2023 11:04:18 +0200 Subject: [PATCH] Disable the 'openssl-hash' feature by default Since the feature breaks Qt build in some configurations, disable it by default and make private, so users should enable it explicitly and make sure that openssl libraries are accessible for linking at build time by either PATH or LD_LIBRARY_PATH. Fixes: QTBUG-114783 Pick-to: 6.6 Change-Id: I6eb53c43ed937ec1c0164025bc8953cc5170dc44 Reviewed-by: Alexandru Croitor --- src/corelib/configure.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake index 392ba6de36c..446473743f6 100644 --- a/src/corelib/configure.cmake +++ b/src/corelib/configure.cmake @@ -917,8 +917,9 @@ qt_feature("permissions" PUBLIC LABEL "Application permissions" PURPOSE "Provides support for requesting user permission to access restricted data or APIs" ) -qt_feature("openssl-hash" PUBLIC +qt_feature("openssl-hash" PRIVATE LABEL "OpenSSL based cryptographic hash" + AUTODETECT OFF CONDITION QT_FEATURE_openssl_linked AND QT_FEATURE_opensslv30 PURPOSE "Uses OpenSSL based implementation of cryptographic hash algorithms." )