summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-05-09 13:19:03 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2017-05-10 04:16:59 +0000
commit7be0546cc040dc1b9d2dbb0bb0614bfcccb3e6bb (patch)
tree3be8b720f80ea47f64f894c72768b5f4673da602
parent637beda0062ff65918823147830b52e29ae550a6 (diff)
Prefer NSS on all Linux builds
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 <michael.bruning@qt.io>
-rw-r--r--mkspecs/features/configure.prf6
1 files changed, 2 insertions, 4 deletions
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
index f56f9a55..0fc2beaa 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 {