From 7be0546cc040dc1b9d2dbb0bb0614bfcccb3e6bb Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 9 May 2017 13:19:03 +0200 Subject: Prefer NSS on all Linux builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise we can get certificate errors on a lot distros, for many pages including our own and Google's. Task-number: QTBUG-60603 Change-Id: I52f3486711438389ed8a5d7272bf5b211a37c805 Reviewed-by: Michael BrĂ¼ning --- mkspecs/features/configure.prf | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf index f56f9a55e..0fc2beaa7 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -119,10 +119,8 @@ defineTest(runConfigure) { WEBENGINE_CONFIG += use_bundled_snappy } - !contains(WEBENGINE_CONFIG, embedded_build) { - packagesExist(nss): WEBENGINE_CONFIG += use_nss - else: log("System NSS not found, BoringSSL will be used.$${EOL}") - } + packagesExist(nss): WEBENGINE_CONFIG += use_nss + else: log("System NSS not found, BoringSSL will be used.$${EOL}") } win32 { -- cgit v1.2.3