diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-11 09:05:49 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-04-11 15:33:49 +0000 |
| commit | 22a550303618202135e58f5673e7b8935d578687 (patch) | |
| tree | 560918164edd7b76a2a8b6246f6dbca0ee69cf9a /src/core/config/linux.pri | |
| parent | f8ed4ca51333157170f0fc94e2deff0d91cf4833 (diff) | |
| parent | 7978feadee937299798372bced1680f52b4b1842 (diff) | |
Merge "Merge branch '5.6' into 5.7" into refs/staging/5.7v5.7.0-beta1
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 } |