1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Remove incorrect hardcoded harfbuzz condition

Browse Source 
The non-system harfbuzz feature doesn't actually have a condition
in the json file.

Change-Id: I4b74915f28da97d6ef8f89690e91306d243913ee
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Alexandru Croitor 2020-03-02 16:54:07 +01:00
parent aa5e43d491
commit d50b22e75d
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/configure.cmake
View File

@ -635,7 +635,6 @@ qt_feature("gbm"
qt_feature_config("gbm" QMAKE_PUBLIC_QT_CONFIG) qt_feature_config("gbm" QMAKE_PUBLIC_QT_CONFIG)
qt_feature("harfbuzz" PUBLIC PRIVATE qt_feature("harfbuzz" PUBLIC PRIVATE
LABEL "HarfBuzz" LABEL "HarfBuzz"
CONDITION harfbuzz_FOUND
) )
qt_feature_definition("harfbuzz" "QT_NO_HARFBUZZ" NEGATE VALUE "1") qt_feature_definition("harfbuzz" "QT_NO_HARFBUZZ" NEGATE VALUE "1")
qt_feature("system-harfbuzz" PRIVATE qt_feature("system-harfbuzz" PRIVATE

1
util/cmake/configurejson2cmake.py
View File

@ -717,7 +717,6 @@ def parseFeature(ctx, feature, data, cm_fh):
"disable": "NOT TEST_posix_iconv OR TEST_iconv_needlib", "disable": "NOT TEST_posix_iconv OR TEST_iconv_needlib",
}, },
"GNUmake": None, "GNUmake": None,
"harfbuzz": {"condition": "harfbuzz_FOUND"},
"host-dbus": None, "host-dbus": None,
"iconv": { "iconv": {
"condition": "NOT QT_FEATURE_icu AND QT_FEATURE_textcodec AND ( TEST_posix_iconv OR TEST_sun_iconv )" "condition": "NOT QT_FEATURE_icu AND QT_FEATURE_textcodec AND ( TEST_posix_iconv OR TEST_sun_iconv )"