From 82900c7b96b2a6fb42fe3841df7685b820edd588 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 24 Mar 2016 13:55:28 +0100 Subject: Use system NSS only for certificate handling Compiling against NSS 3.23 fails with current Chromium. Also, with NSS 3.21 there are failures connecting to e.g. google.com. Fix this by adapting the setup endorsed by upstream Chromium: BoringSSL is always used for cryptography, and NSS only for certificate handlng. Patches included in 3rdparty update: 0a385bb [backport] Call EnsureNSSHttpIOInit in the chimera build. 0472123 Fix build against newer NSS 90c62c4 [Backport] update to libpng 1.2.56 34857b8 [Backport] Stop large iCCP chunks causing delays and "Aw Snap!" Task-number: QTBUG-52193 Task-number: QTBUG-51890 Task-number: QTBUG-52068 Change-Id: If8aaed9b9a09475c5ed0dfec64d31f45ce9670f5 Reviewed-by: Allan Sandfeld Jensen --- tools/qmake/mkspecs/features/configure.prf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/qmake/mkspecs/features/configure.prf') diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index 4cb4600b6..953572dc0 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -72,9 +72,9 @@ defineTest(runConfigure) { defineTest(finalizeConfigure) { linux { use?(nss) { - log("SSL............................... Using system NSS$${EOL}") + log("Certificate handling.............. Using system NSS$${EOL}") } else { - log("SSL............................... Using bundled BoringSSL$${EOL}") + log("Certificate handling.............. Using bundled BoringSSL$${EOL}") } use?(system_icu) { packagesExist("icu-uc icu-i18n") { -- cgit v1.2.3