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 /src | |
| 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 'src')
| -rw-r--r-- | src/gui/configure.cmake | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index 271c8a182e..03a3734691 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -6,10 +6,6 @@ set(INPUT_freetype "undefined" CACHE STRING "") set_property(CACHE INPUT_freetype PROPERTY STRINGS undefined no qt system) -# input harfbuzz -set(INPUT_harfbuzz "undefined" CACHE STRING "") -set_property(CACHE INPUT_harfbuzz PROPERTY STRINGS undefined no qt system) - # input libjpeg set(INPUT_libjpeg "undefined" CACHE STRING "") set_property(CACHE INPUT_libjpeg PROPERTY STRINGS undefined no qt system) @@ -479,15 +475,9 @@ qt_feature("fontconfig" PUBLIC PRIVATE qt_feature_definition("fontconfig" "QT_NO_FONTCONFIG" NEGATE VALUE "1") 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 - LABEL " Using system HarfBuzz" - AUTODETECT NOT APPLE AND NOT WIN32 - CONDITION QT_FEATURE_harfbuzz AND harfbuzz_FOUND - ENABLE INPUT_harfbuzz STREQUAL 'system' - DISABLE INPUT_harfbuzz STREQUAL 'qt' -) qt_feature("qqnx_imf" PRIVATE LABEL "IMF" CONDITION libs.imf OR FIXME |