summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/network/configure.cmake4
-rw-r--r--src/network/qt_cmdline.cmake1
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)