diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2018-10-03 12:00:02 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-10-03 12:19:22 +0000 |
| commit | 8e485a2bfa4632bfefea861c2a06d9a6e8fc5c33 (patch) | |
| tree | 6612146686edd3d1dccd74f37f3eea20fe07885a | |
| parent | 3439f344fbb4c1ee2b13ddb54435716c53d79be2 (diff) | |
| download | meta-qt5-8e485a2bfa4632bfefea861c2a06d9a6e8fc5c33.tar.gz | |
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.
Task-number: QTBUG-70277
Change-Id: Ib4395bcfcfccb8bfc737f4ef2fc52f4cfba4a260
Reviewed-by: Mikko Gronoff <mikko.gronoff@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 2cf4af19..f7c50c29 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
| @@ -107,7 +107,7 @@ PACKAGECONFIG[glib] = "-glib,-no-glib,glib-2.0" | |||
| 107 | # fontdatabases/basic/qbasicfontdatabase.cpp will fail to build and system freetype | 107 | # fontdatabases/basic/qbasicfontdatabase.cpp will fail to build and system freetype |
| 108 | # works only together with fontconfig | 108 | # works only together with fontconfig |
| 109 | PACKAGECONFIG[freetype] = "-system-freetype,-qt-freetype,freetype" | 109 | PACKAGECONFIG[freetype] = "-system-freetype,-qt-freetype,freetype" |
| 110 | PACKAGECONFIG[harfbuzz] = "-system-harfbuzz,-no-harfbuzz,harfbuzz" | 110 | PACKAGECONFIG[harfbuzz] = "-system-harfbuzz,-qt-harfbuzz,harfbuzz" |
| 111 | PACKAGECONFIG[jpeg] = "-system-libjpeg,-no-libjpeg,jpeg" | 111 | PACKAGECONFIG[jpeg] = "-system-libjpeg,-no-libjpeg,jpeg" |
| 112 | PACKAGECONFIG[libpng] = "-system-libpng,-no-libpng,libpng" | 112 | PACKAGECONFIG[libpng] = "-system-libpng,-no-libpng,libpng" |
| 113 | PACKAGECONFIG[gif] = "-gif,-no-gif" | 113 | PACKAGECONFIG[gif] = "-gif,-no-gif" |