summaryrefslogtreecommitdiffstats
path: root/src/core/config
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-01-06 15:30:47 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-01-06 14:37:38 +0000
commit5c2cbfccf9aafb547b0b30914c4056abd25942a4 (patch)
tree24ddeedcfa54db2ce2b9a44dd55faea8e1ee0c8e /src/core/config
parentc3ee845db74f540603aada8df7dccd680889f7bb (diff)
Avoid overriding new and delete
As a minimum this produces valgrind warnings of mismatched new and delete. No runtime issues have been observed outside of valgrind though. Change-Id: I5ebb6b380f25f117434633e55dd7fdf04260f0bc Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'src/core/config')
-rw-r--r--src/core/config/linux.pri4
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 += \