diff options
| author | Михаил Светкин <mikhail.svetkin@qt.io> | 2019-02-11 13:27:00 +0100 |
|---|---|---|
| committer | Mikhail Svetkin <mikhail.svetkin@qt.io> | 2019-03-01 19:24:50 +0000 |
| commit | 3c9d7dfb304dcad8ceea29ac729e76d8eca913f9 (patch) | |
| tree | 6bda89799a2c29746b4dbb820f5ab8c7405b3b0d /util/cmake/configurejson2cmake.py | |
| parent | 07f922286c9224b2999e8fc721ab5f180542eb8c (diff) | |
cmake: Cleanup harfbuzz features
Remove system-harfbuzz feature and use harfbuzz feature as system
Change-Id: I441345a667450f1c2d19380b0709911011c7ceb7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'util/cmake/configurejson2cmake.py')
| -rwxr-xr-x | util/cmake/configurejson2cmake.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index a684130c68..efce7fee4a 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -432,6 +432,8 @@ def parseInput(ctx, input, data, cm_fh): "gui", + "harfbuzz", + "headersclean", "incredibuild-xge", @@ -708,6 +710,9 @@ def parseFeature(ctx, feature, data, cm_fh): 'disable': 'NOT TEST_posix_iconv OR TEST_iconv_needlib', }, 'GNUmake': None, + 'harfbuzz': { + 'condition': 'HARFBUZZ_FOUND' + }, 'host-dbus': None, 'iconv': { 'condition': 'NOT QT_FEATURE_icu AND QT_FEATURE_textcodec AND ( TEST_posix_iconv OR TEST_sun_iconv )' @@ -759,6 +764,7 @@ def parseFeature(ctx, feature, data, cm_fh): }, 'system-doubleconversion': None, # No system libraries anymore! 'system-freetype': None, + 'system-harfbuzz': None, 'system-jpeg': None, 'system-pcre2': None, 'system-png': None, |