summaryrefslogtreecommitdiffstats
path: root/config_help.txt
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-07 01:01:16 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-07 07:28:00 +0100
commit0b14e657f4fcfd12377711d7835fb77cf6615bd5 (patch)
tree7cedaa1cf8da63c19654c5cd8910028c00df3b99 /config_help.txt
parent42ecdfe6f3bcbf3e35ca88b24af07249e3936fc7 (diff)
parentc75e8a661852952b12da95c48ad2c1b88e6cf7e1 (diff)
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'config_help.txt')
-rw-r--r--config_help.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/config_help.txt b/config_help.txt
index 9b6a696527..5cba7316b1 100644
--- a/config_help.txt
+++ b/config_help.txt
@@ -258,6 +258,7 @@ Network options:
-no-openssl .......... Do not use OpenSSL [default on Apple and WinRT]
-openssl-linked ...... Use OpenSSL and link to libssl [no]
-openssl-runtime ..... Use OpenSSL and dynamically load libssl [auto]
+ -schannel ............ Use Secure Channel [no] (Windows only)
-securetransport ..... Use SecureTransport [auto] (Apple only)
-sctp ................ Enable SCTP support [no]