diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2016-03-24 13:55:28 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2016-04-01 14:29:13 +0000 |
| commit | 82900c7b96b2a6fb42fe3841df7685b820edd588 (patch) | |
| tree | 40b185a322b5552cb0aecfca3a453fc16399c831 /src | |
| parent | f22435da983a9e0070ef9c969bb9aa8c1191c0a6 (diff) | |
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 <third_party/libpng> [Backport] update to libpng 1.2.56
34857b8 <third_party/libpng> [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 <allan.jensen@theqtcompany.com>
Diffstat (limited to 'src')
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/core/config/linux.pri | 9 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/3rdparty b/src/3rdparty -Subproject 3b2b78caa761db2b7b25dc51c3dae8316f595db +Subproject 0a385bb01d9cf060fae4c9d350ee98561654df9 diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 88c1a41aa..39eeb2a90 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -18,11 +18,14 @@ GYP_CONFIG += \ use_gio=0 \ use_gnome_keyring=0 \ use_kerberos=0 \ - use_pango=0 + use_pango=0 \ + use_openssl=1 -!use?(nss) { +use?(nss) { + GYP_CONFIG += use_nss_certs=1 \ + use_openssl_certs=0 +} else { GYP_CONFIG += use_nss_certs=0 \ - use_openssl=1 \ use_openssl_certs=1 } |