diff options
Diffstat (limited to 'src/network/configure.json')
| -rw-r--r-- | src/network/configure.json | 46 |
1 files changed, 13 insertions, 33 deletions
diff --git a/src/network/configure.json b/src/network/configure.json index 916448a727..d46fbfc101 100644 --- a/src/network/configure.json +++ b/src/network/configure.json @@ -89,31 +89,6 @@ }, "tests": { - "getaddrinfo": { - "label": "getaddrinfo()", - "type": "compile", - "test": { - "head": [ - "#include <stdio.h>", - "#include <stdlib.h>", - "#ifdef __MINGW32__", - "# include <winsock2.h>", - "# include <ws2tcpip.h>", - "#else", - "# include <sys/types.h>", - "# include <sys/socket.h>", - "# include <netdb.h>", - "#endif" - ], - "main": [ - "addrinfo *res = 0;", - "(void) getaddrinfo(\"foo\", 0, 0, &res);", - "freeaddrinfo(res);", - "gai_strerror(0);" - ] - }, - "use": "network" - }, "getifaddrs": { "label": "getifaddrs()", "type": "compile", @@ -154,6 +129,12 @@ ] }, "use": "network" + }, + "openssl11": { + "label": "OpenSSL v. 1.1 support", + "type": "compile", + "test": "unix/openssl11", + "use": "network" } }, @@ -164,11 +145,6 @@ "emitIf": "config.darwin", "output": [ "feature", "privateFeature" ] }, - "getaddrinfo": { - "label": "getaddrinfo()", - "condition": "tests.getaddrinfo", - "output": [ "feature" ] - }, "getifaddrs": { "label": "getifaddrs()", "condition": "tests.getifaddrs", @@ -221,6 +197,11 @@ "condition": "config.winrt || features.securetransport || features.openssl", "output": [ "publicFeature", "feature" ] }, + "opensslv11": { + "label": "OpenSSL v. 1.1", + "condition": "tests.openssl11", + "output": ["publicFeature", "feature"] + }, "sctp": { "label": "SCTP", "autoDetect": false, @@ -254,14 +235,13 @@ "label": "QNetworkProxy", "purpose": "Provides network proxy support.", "section": "Networking", - "condition": "!config.winrt", "output": [ "publicFeature", "feature" ] }, "socks5": { "label": "SOCKS5", "purpose": "Provides SOCKS5 support in QNetworkProxy.", "section": "Networking", - "condition": "!config.winrt && features.networkproxy", + "condition": "features.networkproxy", "output": [ "publicFeature", "feature" ] }, "networkinterface": { @@ -327,7 +307,7 @@ For example: "args": "corewlan", "condition": "config.darwin" }, - "getaddrinfo", "getifaddrs", "ipv6ifname", "libproxy", + "getifaddrs", "ipv6ifname", "libproxy", { "type": "feature", "args": "securetransport", |