From 4b5f80c1f6831d4e22de00f33f69f3992d08dfba Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Wed, 30 Nov 2016 12:11:57 +0100 Subject: qtwebkit: Always enable icu in QT_CONFIG Allow qtwebkit to be built even if qtbase was configured without icu. Signed-off-by: Andreas Oberritter Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebkit_git.bb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 78ca1f54..d0d7ee8c 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -64,6 +64,9 @@ do_configure_prepend() { sed -e 's/\s\(config_fontconfig: \)/ OE_FONTCONFIG_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf } +# Forcibly enable ICU, so qtbase doesn't need it. +EXTRA_QMAKEVARS_PRE += "QT_CONFIG+=icu" + # qtwebkit gets terribly big when linking with all debug info, disable by default QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0" EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}" -- cgit v1.2.3