1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable openslv(11|30) if -no-openssl is passed to configure

Browse Source 
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 <alexey.edelev@qt.io>
This commit is contained in:
Mårten Nordheim 2022-11-17 19:38:53 +01:00
parent b0e1dc652d
commit 2d0f73856a
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.cmake
View File

@ -1086,10 +1086,12 @@ qt_feature_definition("openssl-linked" "QT_LINKED_OPENSSL")
qt_feature("opensslv11" PUBLIC qt_feature("opensslv11" PUBLIC
LABEL "OpenSSL 1.1" LABEL "OpenSSL 1.1"
CONDITION TEST_opensslv11 OR TEST_opensslv11_headers CONDITION TEST_opensslv11 OR TEST_opensslv11_headers
DISABLE INPUT_openssl STREQUAL 'no' OR INPUT_ssl STREQUAL 'no'
) )
qt_feature("opensslv30" PUBLIC qt_feature("opensslv30" PUBLIC
LABEL "OpenSSL 3.0" LABEL "OpenSSL 3.0"
CONDITION TEST_opensslv30 OR TEST_opensslv30_headers CONDITION TEST_opensslv30 OR TEST_opensslv30_headers
DISABLE INPUT_openssl STREQUAL 'no' OR INPUT_ssl STREQUAL 'no'
) )
qt_feature("ccache" qt_feature("ccache"
LABEL "Using ccache" LABEL "Using ccache"