diff options
| author | Alexandru Croitor <[email protected]> | 2020-03-02 16:54:07 +0100 |
|---|---|---|
| committer | Alexandru Croitor <[email protected]> | 2020-03-04 16:16:27 +0000 |
| commit | d50b22e75df0e0fcecf987813b873e717a225e66 (patch) | |
| tree | e006df1523dd130e011725ae394a8b114316b5c4 | |
| parent | aa5e43d49169fce27821c1296a0c80966786c138 (diff) | |
CMake: Remove incorrect hardcoded harfbuzz condition
The non-system harfbuzz feature doesn't actually have a condition
in the json file.
Change-Id: I4b74915f28da97d6ef8f89690e91306d243913ee
Reviewed-by: Leander Beernaert <[email protected]>
Reviewed-by: Joerg Bornemann <[email protected]>
| -rw-r--r-- | src/gui/configure.cmake | 1 | ||||
| -rwxr-xr-x | util/cmake/configurejson2cmake.py | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index 7b3cd14ce49..c7a11e2b1e8 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -635,7 +635,6 @@ qt_feature("gbm" qt_feature_config("gbm" QMAKE_PUBLIC_QT_CONFIG) qt_feature("harfbuzz" PUBLIC PRIVATE LABEL "HarfBuzz" - CONDITION harfbuzz_FOUND ) qt_feature_definition("harfbuzz" "QT_NO_HARFBUZZ" NEGATE VALUE "1") qt_feature("system-harfbuzz" PRIVATE diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index f22ff2a3c6c..8e252703491 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -717,7 +717,6 @@ 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 )" |