diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2018-10-03 12:00:02 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-10-04 12:02:44 +0000 |
| commit | db18ae962b8a8faf1d8131af02fa0f1fabe8d34d (patch) | |
| tree | 8b3a76ec8c92d007138f03e671f552ff8cfafa33 | |
| parent | fcda0f81c5f54e14b9db2279c1d86d529f2d3cf2 (diff) | |
qtbase: default to internal harfbuzz-ng
With -no-harfbuzz, Qt uses internal copy of harfbuzz-old, which is
no longer maintained, and is extremely buggy. Instead, use the
harfbuzz-ng version if systen harfbuzz is not used.
(cherry-picked from commit 8e485a2bfa4632bfefea861c2a06d9a6e8fc5c33)
Task-number: QTBUG-70277
Change-Id: I22db1d1814a1854affcb28837bf9131838c4cecf
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index f2b88b13..a62a5f80 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -103,7 +103,7 @@ PACKAGECONFIG[glib] = "-glib,-no-glib,glib-2.0" # fontdatabases/basic/qbasicfontdatabase.cpp will fail to build and system freetype # works only together with fontconfig PACKAGECONFIG[freetype] = "-system-freetype,-qt-freetype,freetype" -PACKAGECONFIG[harfbuzz] = "-system-harfbuzz,-no-harfbuzz,harfbuzz" +PACKAGECONFIG[harfbuzz] = "-system-harfbuzz,-qt-harfbuzz,harfbuzz" PACKAGECONFIG[jpeg] = "-system-libjpeg,-no-libjpeg,jpeg" PACKAGECONFIG[libpng] = "-system-libpng,-no-libpng,libpng" PACKAGECONFIG[gif] = "-gif,-no-gif" |