summaryrefslogtreecommitdiffstats
path: root/config_help.txt
diff options
context:
space:
mode:
authorOliver Wolff <oliver.wolff@qt.io>2020-06-05 09:24:37 +0200
committerLiang Qi <liang.qi@qt.io>2020-06-06 20:25:49 +0200
commit45b0f1be686cfba8dcecb9be5c875cae59c69276 (patch)
tree363dfd46575d147206267d854ce14747157f432e /config_help.txt
parentaa81b90738ce9faee5e433617c8bd243cb238729 (diff)
Remove winrt
Macros and the await helper function from qfunctions_winrt(_p).h are needed in other Qt modules which use UWP APIs on desktop windows. Task-number: QTBUG-84434 Change-Id: Ice09c11436ad151c17bdccd2c7defadd08c13925 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'config_help.txt')
-rw-r--r--config_help.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/config_help.txt b/config_help.txt
index f42a8ddd90..6a3e0c7eef 100644
--- a/config_help.txt
+++ b/config_help.txt
@@ -117,7 +117,7 @@ Build options:
-appstore-compliant .. Disable code that is not allowed in platform app stores.
This is on by default for platforms which require distribution
through an app store by default, in particular Android,
- iOS, tvOS, watchOS, and Universal Windows Platform. [auto]
+ iOS, tvOS, and watchOS. [auto]
-qtnamespace <name> .. Wrap all Qt library code in 'namespace <name> {...}'.
-qtlibinfix <infix> .. Rename all libQt5*.so to libQt5*<infix>.so.
@@ -254,7 +254,7 @@ Core options:
Network options:
-ssl ................. Enable either SSL support method [auto]
- -no-openssl .......... Do not use OpenSSL [default on Apple and WinRT]
+ -no-openssl .......... Do not use OpenSSL [default on Apple]
-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)