diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2022-11-17 19:38:53 +0100 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2022-11-30 13:48:50 +0000 |
| commit | 2d0f73856a83b53e05dd639e52d06b9dbd702819 (patch) | |
| tree | 6f3d49138cdb44bc4fb6b5c55739f8af245288e7 /configure.cmake | |
| parent | b0e1dc652dbbadee86fa4ad681529bf2d3cbc4ed (diff) | |
| download | qtbase-2d0f73856a83b53e05dd639e52d06b9dbd702819.tar.gz | |
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 <alexey.edelev@qt.io>
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
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" |