summaryrefslogtreecommitdiffstats
path: root/configure.json
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2017-08-30 13:02:20 +0200
committerMichal Klocek <michal.klocek@qt.io>2017-09-05 16:16:43 +0000
commit9b449045fbd5fd3b58bcaff6cf0c5878cd6e64eb (patch)
treef967cd77d729b28d724dc1e6b7f5b3de98c869d5 /configure.json
parent6d9fe6ba35024efc8e0a26435b51e25aa3ea7f09 (diff)
Require NSS for linux builds
OpenSSL certificate validation was dropped in https://codereview.chromium.org/2862543003 Bundled NSS was deopped in https://codereview.chromium.org/1882433002 Task-number: QTBUG-52193 Task-number: QTBUG-62891 Change-Id: I300c13c30a2625bbe56beb0659107d2a395b0a4d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'configure.json')
-rw-r--r--configure.json17
1 files changed, 4 insertions, 13 deletions
diff --git a/configure.json b/configure.json
index d25517c33..19a32a17c 100644
--- a/configure.json
+++ b/configure.json
@@ -12,7 +12,6 @@
"ffmpeg": { "type": "enum", "name": "system-ffmpeg", "values": { "system": "yes", "qt": "no" } },
"opus": { "type": "enum", "name": "system-opus", "values": { "system": "yes", "qt": "no" } },
"webp": { "type": "enum", "name": "system-webp", "values": { "system": "yes", "qt": "no" } },
- "nss-certificate-handling": "boolean",
"pepper-plugins": "boolean",
"printing-and-pdf": "boolean",
"proprietary-codecs": "boolean",
@@ -61,7 +60,7 @@
]
},
"nss": {
- "label": "NSS",
+ "label": "nss",
"sources": [
{ "type": "pkgConfig", "args": "nss" }
]
@@ -182,12 +181,9 @@
"autoDetect": "!features.embedded",
"output": [ "privateFeature" ]
},
- "nss-certificate-handling": {
- "label": "NSS certificate handling",
- "purpose": "Use NSS to handle certificates instead of BoringSSL. Recommended on Linux.",
- "section": "WebEngine",
- "condition": "config.unix && !config.darwin",
- "autoDetect": "libs.nss",
+ "system-nss": {
+ "label": "nss",
+ "condition": "config.unix && !config.darwin && libs.nss",
"output": [ "privateFeature" ]
},
"system-webp": {
@@ -277,11 +273,6 @@
"condition": "config.unix"
},
{
- "type": "feature",
- "args": "nss-certificate-handling",
- "condition": "config.unix && !config.darwin"
- },
- {
"section": "System libraries",
"condition": "config.unix",
"entries": [