From e908589afec25bc9291f77266a6d50846e91be7b Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 25 Jun 2018 13:00:52 +0300 Subject: qt5: upgrade to 5.9.7 * Update to Qt 5.9.7 * 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 system harfbuzz is not used. Signed-off-by: mikko.gronoff Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes-qt/qt5/qtbase_git.bb') diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index c1006ca2..eb2f35e8 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -101,7 +101,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" @@ -220,4 +220,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "9c50112304033c631e52f062496f3111f24835a2" +SRCREV = "81b29a44d248b5037a2f05dd8815e000d9472f0e" -- cgit v1.2.3-54-g00ecf