diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-11-01 11:17:41 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-02-22 06:37:33 +0100 |
| commit | eea53f0dd46c428cb4583d384c948ad61f1dbd21 (patch) | |
| tree | c3018d1ee22dcda0bf753e78b0f1d7d7b2aa3b23 | |
| parent | 6fdfc5b99de9e33538a0a73416be77a09ebdf929 (diff) | |
configure: Remove declaration of the OPENSSL_PATH variable
This variable was used in Qt5 to specify the install location of the
OpenSSL library. In Qt6, OPENSSL_ROOT_DIR serves this purpose, and
OPENSSL_PATH is unused.
Change-Id: I40cc412bb35666dac3dd134ca8bfb67f3d524f80
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit ce34ed6eabba45546dc40ce0b22b872a69cacd87)
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
| -rw-r--r-- | src/network/configure.cmake | 4 | ||||
| -rw-r--r-- | src/network/qt_cmdline.cmake | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/network/configure.cmake b/src/network/configure.cmake index acd9090046..0b86c4b6bf 100644 --- a/src/network/configure.cmake +++ b/src/network/configure.cmake @@ -1,5 +1,3 @@ - - #### Inputs @@ -431,6 +429,6 @@ qt_configure_end_summary_section() # end of "Qt Network" section qt_configure_add_report_entry( TYPE NOTE MESSAGE "When linking against OpenSSL, you can override the default library names through OPENSSL_LIBS. For example: OPENSSL_LIBS='-L/opt/ssl/lib -lssl -lcrypto' ./configure -openssl-linked" - CONDITION NOT ANDROID AND QT_FEATURE_openssl_linked AND ( NOT TEST_openssl.source EQUAL 0 ) AND INPUT_openssl.prefix STREQUAL '' AND INPUT_openssl.libs STREQUAL '' AND INPUT_openssl.libs.debug STREQUAL '' OR FIXME + CONDITION NOT ANDROID AND QT_FEATURE_openssl_linked AND ( NOT TEST_openssl.source EQUAL 0 ) AND OPENSSL_ROOT_DIR STREQUAL '' AND INPUT_openssl.libs STREQUAL '' AND INPUT_openssl.libs.debug STREQUAL '' OR FIXME ) # special case end diff --git a/src/network/qt_cmdline.cmake b/src/network/qt_cmdline.cmake index 0a24507788..5bd73f6ed8 100644 --- a/src/network/qt_cmdline.cmake +++ b/src/network/qt_cmdline.cmake @@ -9,4 +9,3 @@ qt_commandline_option(securetransport TYPE boolean) qt_commandline_option(schannel TYPE boolean) qt_commandline_option(ssl TYPE boolean) qt_commandline_option(system-proxies TYPE boolean) -qt_commandline_assignment(OPENSSL_PATH openssl.prefix) |