diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2015-09-22 15:23:44 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2015-09-30 15:40:03 +0000 |
| commit | 0310d0d71287f78339c47daaff7598a30d2f08f8 (patch) | |
| tree | 16920f13aa3f0cbb34565dabd4001a0099ae43b5 | |
| parent | 22816c6fb26ae869596a3ab5b99f082b5d3ff2da (diff) | |
| download | qtwebkit-0310d0d71287f78339c47daaff7598a30d2f08f8.tar.gz | |
Added workaround for use_system_malloc to omit WTF_ prefix in macro name.
Unlike other USE_* features, USE_SYSTEM_MALLOC is not checked with USE()
macro (which expects WTF_ prefix), so passing WTF_USE_SYSTEM_MALLOC
into DEFINES just does not work.
Change-Id: I8e1ec29124ee77d2d5ea2e8ad44bc113091edcd9
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| -rw-r--r-- | Tools/qmake/mkspecs/features/functions.prf | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Tools/qmake/mkspecs/features/functions.prf b/Tools/qmake/mkspecs/features/functions.prf index 7b3ab01c4..9602c2051 100644 --- a/Tools/qmake/mkspecs/features/functions.prf +++ b/Tools/qmake/mkspecs/features/functions.prf @@ -351,6 +351,10 @@ defineReplace(configDefines) { plugin_architecture: defines += $$upper($$config)=1 next() } + equals(config, "use_system_malloc") { + use: defines += $$upper($$config)=1 + next() + } match = $$find(config, "^use_") !isEmpty(match) { use: defines += WTF_$$upper($$config)=1 |