diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-11 10:01:36 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-11 10:53:06 +0200 |
| commit | 7978feadee937299798372bced1680f52b4b1842 (patch) | |
| tree | bb844daade8c195c0a963f4663c2a0f880bd840a /src/core/config/linux.pri | |
| parent | 56ceccc4d4ff395983c4a2fbbe12fe8cb591cfb5 (diff) | |
| parent | 56955e73d4be21bc3f086d1c805352a96944a25c (diff) | |
Merge branch '5.6' into 5.7
Change-Id: I53645ee5405b1c43807123fd3c196e314cfd1ce9
Diffstat (limited to 'src/core/config/linux.pri')
| -rw-r--r-- | src/core/config/linux.pri | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 7d6c7bfbc..3245888ef 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 } |