diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2023-08-09 11:04:18 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2023-08-09 15:53:07 +0200 |
| commit | d55c5e2a4384038c1deb5066e48d29444f891ebc (patch) | |
| tree | d4031a927bbb4eef553282c95408e6eab5370673 | |
| parent | 1b5e13c8d9db92cec41a1b50d74ce3af5853a7dd (diff) | |
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 <alexandru.croitor@qt.io>
| -rw-r--r-- | src/corelib/configure.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake index 392ba6de36..446473743f 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." ) |