From e36f69c0bca7d1ea5a119288c64f043ba62fe4ce Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Tue, 24 Feb 2015 23:20:51 +1100 Subject: [PATCH] qtwebkit.inc: add PACKAGECONFIG for qtwebchannel (From meta-qt5 rev: 085df473cf381e0464d8875a5332aff2d0c44a9f) Signed-off-by: Jonathan Liu Signed-off-by: Martin Jansa Signed-off-by: Mauro Carvalho Chehab --- meta-qt5/recipes-qt/qt5/qtwebkit.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta-qt5/recipes-qt/qt5/qtwebkit.inc b/meta-qt5/recipes-qt/qt5/qtwebkit.inc index d9eaabb..9ea44b6 100644 --- a/meta-qt5/recipes-qt/qt5/qtwebkit.inc +++ b/meta-qt5/recipes-qt/qt5/qtwebkit.inc @@ -13,12 +13,13 @@ SRC_URI += "\ file://0002-qtwebkit-fix-textrel-x86.patch \ " -PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors" +PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel" PACKAGECONFIG[gstreamer] = "OE_GSTREAMER_ENABLED,,gstreamer1.0 gstreamer1.0-plugins-base" PACKAGECONFIG[gstreamer010] = "OE_GSTREAMER010_ENABLED,,gstreamer gst-plugins-base" PACKAGECONFIG[qtlocation] = "OE_QTLOCATION_ENABLED,,qtlocation" PACKAGECONFIG[qtmultimedia] = "OE_QTMULTIMEDIA_ENABLED,,qtmultimedia" PACKAGECONFIG[qtsensors] = "OE_QTSENSORS_ENABLED,,qtsensors" +PACKAGECONFIG[qtwebchannel] = "OE_QTWEBCHANNEL_ENABLED,,qtwebchannel" PACKAGECONFIG[libwebp] = "OE_LIBWEBP_ENABLED,,libwebp" do_configure_prepend() { @@ -33,6 +34,9 @@ do_configure_prepend() { sed -e 's/(video):\(qtHaveModule(multimediawidgets)\)/(video):OE_QTMULTIMEDIA_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf # disable qtsensors test if it isn't enabled by PACKAGECONFIG sed -e 's/\s\(qtHaveModule(sensors)\)/ OE_QTSENSORS_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf + # disable qtwebchannel test if it isn't enabled by PACKAGECONFIG + sed -e 's/\s\(qtHaveModule(webchannel)\)/ OE_QTWEBCHANNEL_ENABLED:\1/' -i ${S}/Source/WebKit2/Target.pri + sed -e 's/\s\(qtHaveModule(webchannel)\)/ OE_QTWEBCHANNEL_ENABLED:\1/' -i ${S}/Source/WebKit2/WebKit2.pri # disable libwebp test if it isn't enabled by PACKAGECONFIG sed -e 's/\s\(config_libwebp: \)/ OE_LIBWEBP_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf } -- 2.7.4