diff options
author | Michal Klocek <michal.klocek@qt.io> | 2017-08-30 13:02:20 +0200 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2017-09-05 16:16:43 +0000 |
commit | 9b449045fbd5fd3b58bcaff6cf0c5878cd6e64eb (patch) | |
tree | f967cd77d729b28d724dc1e6b7f5b3de98c869d5 /mkspecs | |
parent | 6d9fe6ba35024efc8e0a26435b51e25aa3ea7f09 (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 'mkspecs')
-rw-r--r-- | mkspecs/features/configure.prf | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf index 6e9a28e4d..37128bf93 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -50,7 +50,7 @@ defineTest(runConfigure) { qtConfig(system-opus): WEBENGINE_CONFIG += use_system_opus qtConfig(system-ffmpeg): WEBENGINE_CONFIG += use_system_ffmpeg qtConfig(system-icu): WEBENGINE_CONFIG += use_system_icu - qtConfig(nss-certificate-handling): WEBENGINE_CONFIG += use_nss + !contains(WEBENGINE_CONFIG, use_system_libwebp): WEBENGINE_CONFIG += use_bundled_libwebp !contains(WEBENGINE_CONFIG, use_system_opus): WEBENGINE_CONFIG += use_bundled_opus !contains(WEBENGINE_CONFIG, use_system_ffmpeg): WEBENGINE_CONFIG += use_bundled_ffmpeg @@ -68,6 +68,11 @@ defineTest(runConfigure) { skipBuild("A suitable version of libc could not be found. See: https://sourceware.org/bugzilla/show_bug.cgi?id=14898") return(false) } + !qtConfig(system-nss) { + skipBuild("A suitable version of NSS could not be found.") + return(false) + } + WEBENGINE_CONFIG += use_nss QT_FOR_CONFIG += gui-private !config_khr:skipBuild("khronos development headers appear to be missing (mesa/libegl1-mesa-dev)") |