From 4654fd86fb5de097a8ad271c2f53e99e19c36c93 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 16 Sep 2015 12:04:52 +0200 Subject: Make NSS vs BoringSSL choice more flexible MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make the NSS library optional on Linux to reduce the hard coded difference between embedded and desktop builds. Change-Id: I3d7f703ead0ff325ffd2ae272e7e4c2d5258fc25 Reviewed-by: Michael Brüning --- src/core/config/embedded_linux.pri | 3 --- src/core/config/linux.pri | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri index cd12204f9..50f94147e 100644 --- a/src/core/config/embedded_linux.pri +++ b/src/core/config/embedded_linux.pri @@ -33,9 +33,6 @@ GYP_CONFIG += \ toolkit_views=1 \ use_custom_freetype=0 \ use_libpci=0 \ - use_nss_certs=0 \ - use_openssl=1 \ - use_openssl_certs=1 \ use_ozone=1 \ use_system_fontconfig=1 \ icu_use_data_file_flag=0 \ diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 4c2e70daf..803043c50 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -18,6 +18,12 @@ GYP_CONFIG += \ use_kerberos=0 \ use_pango=0 +!config_system_nss { + GYP_CONFIG += use_nss_certs=0 \ + use_openssl=1 \ + use_openssl_certs=1 +} + contains(QT_CONFIG, system-zlib): config_system_minizip: GYP_CONFIG += use_system_zlib=1 contains(QT_CONFIG, system-png): GYP_CONFIG += use_system_libpng=1 contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1 -- cgit v1.2.3