summaryrefslogtreecommitdiffstats
path: root/src/network/configure.json
diff options
context:
space:
mode:
Diffstat (limited to 'src/network/configure.json')
-rw-r--r--src/network/configure.json14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/network/configure.json b/src/network/configure.json
index 916448a727..b1c943de6f 100644
--- a/src/network/configure.json
+++ b/src/network/configure.json
@@ -154,6 +154,12 @@
]
},
"use": "network"
+ },
+ "openssl11": {
+ "label": "OpenSSL v. 1.1 support",
+ "type": "compile",
+ "test": "unix/openssl11",
+ "use": "network"
}
},
@@ -221,6 +227,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 +265,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": {