summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-08-26 21:10:56 +0200
committerLars Knoll <lars.knoll@qt.io>2016-09-15 08:24:00 +0000
commitb754b2815d342334f335816b901c051940954942 (patch)
tree8c51eb3d20a19ca558de24c6a86816cf1ced5562 /src/network
parent2d3c73fcfe7a93cb46190e8e82410fe93145dbe0 (diff)
rename description => label in configure.json
"description" suggests something slightly longer. this may seem like a gratuitous change, but the upcoming replacement of the old feature system clarifies makes it seem much less so. Change-Id: Ibe702e01cb146b59127bf1f990b4acaef1c61d55 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/network')
-rw-r--r--src/network/configure.json38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/network/configure.json b/src/network/configure.json
index a647439b19..3372d177c3 100644
--- a/src/network/configure.json
+++ b/src/network/configure.json
@@ -26,7 +26,7 @@
"libraries": {
"corewlan": {
- "description": "CoreWLan",
+ "label": "CoreWLan",
"export": "",
"test": "mac/corewlan",
"sources": [
@@ -40,14 +40,14 @@
]
},
"libproxy": {
- "description": "libproxy",
+ "label": "libproxy",
"test": "common/libproxy",
"sources": [
"-lproxy"
]
},
"openssl": {
- "description": "OpenSSL Libraries",
+ "label": "OpenSSL Libraries",
"export": "",
"sources": [
{ "type": "openssl" },
@@ -68,30 +68,30 @@
"tests": {
"getaddrinfo": {
- "description": "getaddrinfo()",
+ "label": "getaddrinfo()",
"type": "compile",
"test": "unix/getaddrinfo",
"use": "network"
},
"getifaddrs": {
- "description": "getifaddrs()",
+ "label": "getifaddrs()",
"type": "compile",
"test": "unix/getifaddrs",
"use": "network"
},
"ipv6ifname": {
- "description": "IPv6 ifname",
+ "label": "IPv6 ifname",
"type": "compile",
"test": "unix/ipv6ifname",
"use": "network"
},
"openssl": {
- "description": "OpenSSL",
+ "label": "OpenSSL",
"type": "compile",
"test": "unix/openssl"
},
"sctp": {
- "description": "SCTP support",
+ "label": "SCTP support",
"type": "compile",
"test": "unix/sctp",
"use": "network"
@@ -100,34 +100,34 @@
"features": {
"corewlan": {
- "description": "CoreWLan",
+ "label": "CoreWLan",
"condition": "libs.corewlan",
"emitIf": "config.darwin",
"output": [ "feature", "privateFeature" ]
},
"getaddrinfo": {
- "description": "getaddrinfo()",
+ "label": "getaddrinfo()",
"condition": "tests.getaddrinfo",
"output": [ "feature" ]
},
"getifaddrs": {
- "description": "getifaddrs()",
+ "label": "getifaddrs()",
"condition": "tests.getifaddrs",
"output": [ "feature" ]
},
"ipv6ifname": {
- "description": "IPv6 ifname",
+ "label": "IPv6 ifname",
"condition": "tests.ipv6ifname",
"output": [ "feature" ]
},
"libproxy": {
- "description": "libproxy",
+ "label": "libproxy",
"autoDetect": false,
"condition": "libs.libproxy",
"output": [ "privateFeature" ]
},
"openssl": {
- "description": "OpenSSL",
+ "label": "OpenSSL",
"enable": "input.openssl == 'yes' || input.openssl == 'linked' || input.openssl == 'runtime'",
"disable": "input.openssl == 'no' || input.ssl == 'no'",
"autoDetect": "!config.winrt",
@@ -139,7 +139,7 @@
]
},
"openssl-linked": {
- "description": " Qt directly linked to OpenSSL",
+ "label": " Qt directly linked to OpenSSL",
"enable": "input.openssl == 'linked'",
"disable": "input.openssl != 'linked'",
"condition": "features.openssl && libs.openssl",
@@ -154,7 +154,7 @@
]
},
"securetransport": {
- "description": "SecureTransport",
+ "label": "SecureTransport",
"disable": "input.securetransport == 'no' || input.ssl == 'no'",
"condition": "config.darwin && (input.openssl == '' || input.openssl == 'no')",
"output": [
@@ -163,18 +163,18 @@
]
},
"ssl": {
- "description": "SSL",
+ "label": "SSL",
"condition": "config.winrt || features.securetransport || features.openssl",
"output": [ "publicFeature", "feature" ]
},
"sctp": {
- "description": "SCTP",
+ "label": "SCTP",
"autoDetect": false,
"condition": "tests.sctp",
"output": [ "publicFeature", "feature" ]
},
"system-proxies": {
- "description": "Use system proxies",
+ "label": "Use system proxies",
"output": [ "privateFeature" ]
}
},