diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-08-03 14:09:37 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-04 05:55:51 +0000 |
| commit | a9ef2ecb1f1941a9295c58b63987565e6d3518cb (patch) | |
| tree | e338ccb5bc86b8072abd18d29cbb885cb39e3cd4 /configure.json | |
| parent | f26d944dcff91da2cf4d2cfbabbb539e6a4a6e5c (diff) | |
Move NSS certificate handling configuration to configure.json
Change-Id: Ibae2b8ebb90e79ff8337d994b2234eed5e230dcc
Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/configure.json b/configure.json index c4d00ffcc..b291e6645 100644 --- a/configure.json +++ b/configure.json @@ -12,6 +12,7 @@ "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", @@ -58,6 +59,12 @@ "sources": [ { "type": "pkgConfig", "args": "libwebp libwebpdemux" } ] + }, + "nss": { + "label": "NSS", + "sources": [ + { "type": "pkgConfig", "args": "nss" } + ] } }, @@ -171,6 +178,14 @@ "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", + "output": [ "privateFeature" ] + }, "system-webp": { "label": "libwebp and libwebpdemux", "autoDetect": "config.unix", @@ -253,6 +268,11 @@ "condition": "config.unix" }, { + "type": "feature", + "args": "nss-certificate-handling", + "condition": "config.unix && !config.darwin" + }, + { "section": "System libraries", "condition": "config.unix", "entries": [ |