diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-18 12:59:54 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-18 13:02:22 +0100 |
| commit | c2447a308882ba3691d66b2c28df197f571518c7 (patch) | |
| tree | c6535d8e038a517f06ddbef9fee649412555b8ae /src/core/config | |
| parent | b63a932bbe1eb2bdf2584e44378ac3fab243320c (diff) | |
| parent | 42c6033724e2b5a54702d626c57806e53f163c62 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: If16bfc6f0fbfd0040e13a8a3cbaa113fda10f387
Diffstat (limited to 'src/core/config')
| -rw-r--r-- | src/core/config/linux.pri | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 59417997a..b91e795ca 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -21,7 +21,9 @@ GYP_CONFIG += \ use_gnome_keyring=0 \ use_kerberos=0 \ use_pango=0 \ - use_openssl=1 + use_openssl=1 \ + use_allocator=none \ + use_experimental_allocator_shim=0 use?(nss) { GYP_CONFIG += \ |