diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-07 01:01:16 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-07 01:01:16 +0100 |
| commit | c75e8a661852952b12da95c48ad2c1b88e6cf7e1 (patch) | |
| tree | 5a32acf6e2fa4a6500372aa0c94b70b112a3f1c7 /config_help.txt | |
| parent | 68c30e372b01561e8809fcfa5426ae896da70b8e (diff) | |
| parent | 1535fc9fb9ddbfce1680979c0634b4fdf8d75fca (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I6c81e3cb6272adc5c3de2513792bd48604ff4dd0
Diffstat (limited to 'config_help.txt')
| -rw-r--r-- | config_help.txt | 1 |
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] |