diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-08-06 23:46:46 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-08-06 23:46:46 +0200 |
commit | 1ae6dea45986f0588cea30b946e2505be01ca5f9 (patch) | |
tree | 497def231980e90e072f53c33194f61f0f734be0 | |
parent | c3b0cae312427f5608a48add63981b1f90182b6a (diff) | |
download | meta-qt5-1ae6dea45986f0588cea30b946e2505be01ca5f9.tar.gz |
qtwebkit.inc: add PACKAGECONFIG for libwebp
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | recipes-qt/qt5/qtwebkit.inc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index 8054e931..cb652aa1 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/recipes-qt/qt5/qtwebkit.inc | |||
@@ -13,6 +13,7 @@ PACKAGECONFIG[gstreamer010] = "OE_GSTREAMER010_ENABLED,,gstreamer gst-plugins-ba | |||
13 | PACKAGECONFIG[qtlocation] = "OE_QTLOCATION_ENABLED,,qtlocation" | 13 | PACKAGECONFIG[qtlocation] = "OE_QTLOCATION_ENABLED,,qtlocation" |
14 | PACKAGECONFIG[qtmultimedia] = "OE_QTMULTIMEDIA_ENABLED,,qtmultimedia" | 14 | PACKAGECONFIG[qtmultimedia] = "OE_QTMULTIMEDIA_ENABLED,,qtmultimedia" |
15 | PACKAGECONFIG[qtsensors] = "OE_QTSENSORS_ENABLED,,qtsensors" | 15 | PACKAGECONFIG[qtsensors] = "OE_QTSENSORS_ENABLED,,qtsensors" |
16 | PACKAGECONFIG[libwebp] = "OE_LIBWEBP_ENABLED,,libwebp" | ||
16 | 17 | ||
17 | do_configure_prepend() { | 18 | do_configure_prepend() { |
18 | export QMAKE_CACHE_EVAL="CONFIG+=${EXTRA_OECONF}" | 19 | export QMAKE_CACHE_EVAL="CONFIG+=${EXTRA_OECONF}" |
@@ -26,6 +27,8 @@ do_configure_prepend() { | |||
26 | sed -e 's/(video):\(qtHaveModule(multimediawidgets)\)/(video):OE_QTMULTIMEDIA_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf | 27 | sed -e 's/(video):\(qtHaveModule(multimediawidgets)\)/(video):OE_QTMULTIMEDIA_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf |
27 | # disable qtsensors test if it isn't enabled by PACKAGECONFIG | 28 | # disable qtsensors test if it isn't enabled by PACKAGECONFIG |
28 | sed -e 's/\s\(qtHaveModule(sensors)\)/ OE_QTSENSORS_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf | 29 | sed -e 's/\s\(qtHaveModule(sensors)\)/ OE_QTSENSORS_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf |
30 | # disable libwebp test if it isn't enabled by PACKAGECONFIG | ||
31 | sed -e 's/\s\(config_libwebp: \)/ OE_LIBWEBP_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf | ||
29 | } | 32 | } |
30 | 33 | ||
31 | # qtwebkit gets terribly big when linking with all debug info, disable by default | 34 | # qtwebkit gets terribly big when linking with all debug info, disable by default |