From 29c0377f07f4942f9957ea87d59c252148dc9e5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig@qt.io>
Date: Fri, 1 Jun 2018 15:13:30 +0200
Subject: WebAssembly for QtBase
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/network/configure.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/network/configure.json')

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" ]
         },
-- 
cgit v1.2.3