diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-16 12:04:52 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-12 15:23:41 +0000 |
| commit | 4654fd86fb5de097a8ad271c2f53e99e19c36c93 (patch) | |
| tree | c8196e9508db73e1b947c298ba06de8c870fd110 | |
| parent | 3b1faa91c3e8ee4b7fb602b0b476d4deda235378 (diff) | |
Make NSS vs BoringSSL choice more flexible
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 <michael.bruning@theqtcompany.com>
| -rw-r--r-- | src/core/config/embedded_linux.pri | 3 | ||||
| -rw-r--r-- | src/core/config/linux.pri | 6 | ||||
| -rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 17 |
3 files changed, 21 insertions, 5 deletions
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 diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index 8c6876857..90966151d 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -30,7 +30,7 @@ defineTest(runConfigure) { contains(QT_CONFIG, pulseaudio): REQUIRED_PACKAGES += libpulse contains(QT_CONFIG, system-png): REQUIRED_PACKAGES += libpng contains(QT_CONFIG, system-harfbuzz): REQUIRED_PACKAGES += harfbuzz - !cross_compile: REQUIRED_PACKAGES += libpci nss + !cross_compile: REQUIRED_PACKAGES += libpci for(package, $$list($$REQUIRED_PACKAGES)) { !packagesExist($$package):skipBuild("Unmet dependency: $$package") @@ -51,18 +51,31 @@ defineTest(runConfigure) { else: log("System libsrtp not found. Using Chromium's copy.$${EOL}") config_snappy: WEBENGINE_CONFIG += config_system_snappy else: log("System snappy not found. Using Chromium's copy.$${EOL}") + + # Optional dependencies + packagesExist(nss): WEBENGINE_CONFIG += config_system_nss + else: log("System NSS not found, BoringSSL will be used.$${EOL}") } isEmpty(skipBuildReason): { cache(CONFIG, add, $$list(webengine_successfully_configured)) - !isEmpty(WEBENGINE_CONFIG): cache(CONFIG, add, $$list($$WEBENGINE_CONFIG)) + !isEmpty(WEBENGINE_CONFIG) { + CONFIG += $$WEBENGINE_CONFIG + cache(CONFIG, add, $$list($$WEBENGINE_CONFIG)) + } } + export(CONFIG) } # This is called from default_post, at which point we've also parsed # command line options defineTest(finalizeConfigure) { linux { + config_system_nss { + log("SSL............................... Using system NSS$${EOL}") + } else { + log("SSL............................... Using bundled BoringSSL$${EOL}") + } contains(WEBENGINE_CONFIG, use_system_icu) { packagesExist("icu-uc icu-i18n") { log("ICU............................... Using system version$${EOL}") |