diff options
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/core/config/linux.pri | 9 | ||||
| -rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 4 |
3 files changed, 8 insertions, 5 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 } 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") { |