diff options
author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-06-01 15:13:30 +0200 |
---|---|---|
committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2018-08-30 06:48:33 +0000 |
commit | 29c0377f07f4942f9957ea87d59c252148dc9e5b (patch) | |
tree | cb79a59b6c47305ca024675cc1325ed0a6be8aac /src/network/configure.json | |
parent | 707ae5b66774a2ed4713da3b8fa69c1d002c3beb (diff) |
WebAssembly for QtBase
This is the squashed diff from wip/webassembly to dev.
Done-with: Peng Wu <peng.wu@intopalo.com>
Done-with: Sami Enne <sami.enne@intopalo.com>
Done-with: Morten Johan Sørvig <morten.sorvig@qt.io>
Started-by: Andrew Knight <andrew.knight@intopalo.com>
Change-Id: I6562433c0a38d6ec49ab675e0f104f2665f3392d
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/network/configure.json')
-rw-r--r-- | src/network/configure.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/configure.json b/src/network/configure.json index 32fcfb499f..327131ba11 100644 --- a/src/network/configure.json +++ b/src/network/configure.json @@ -198,7 +198,7 @@ "label": "OpenSSL", "enable": "input.openssl == 'yes' || input.openssl == 'linked' || input.openssl == 'runtime'", "disable": "input.openssl == 'no' || input.ssl == 'no'", - "autoDetect": "!config.winrt", + "autoDetect": "!config.winrt && !config.wasm", "condition": "!features.securetransport && (features.openssl-linked || libs.openssl_headers)", "output": [ "privateFeature", @@ -288,6 +288,7 @@ "networkinterface": { "label": "QNetworkInterface", "purpose": "Supports enumerating a host's IP addresses and network interfaces.", + "condition": "!config.wasm", "section": "Networking", "output": [ "publicFeature", "feature" ] }, |