diff options
| author | Jonathan Liu <net147@gmail.com> | 2014-03-31 00:22:52 +1100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-04-20 16:28:54 +0200 |
| commit | c49617bd7a7c0f4e9539e64e2468d6ed281540d7 (patch) | |
| tree | d8eb474162835b3908f96eddd146a5e4d9401228 | |
| parent | 4b000961f3aa3da0717062e7dc0f54cfe0a0288c (diff) | |
qtwebkit: add packageconfig for qtmultimedia
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtwebkit.inc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index 90bd9815..a6322cbb 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/recipes-qt/qt5/qtwebkit.inc @@ -7,10 +7,11 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt" -PACKAGECONFIG ??= "gstreamer qtlocation qtsensors" +PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors" PACKAGECONFIG[gstreamer] = ",,gstreamer1.0 gstreamer1.0-plugins-base" PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base" PACKAGECONFIG[qtlocation] = ",,qtlocation" +PACKAGECONFIG[qtmultimedia] = ",,qtmultimedia" PACKAGECONFIG[qtsensors] = ",,qtsensors" do_configure_prepend() { @@ -20,6 +21,8 @@ do_configure_prepend() { sed -e 's/\s\(packagesExist(".*\<gstreamer-0.10\>.*")\)/ OE_GSTREAMER010_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf # disable qtlocation test if it isn't enabled by PACKAGECONFIG sed -e 's/\s\(qtHaveModule(positioning)\)/ OE_QTLOCATION_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf + # disable qtmultimedia test if it isn't enabled by PACKAGECONFIG + 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 } @@ -27,6 +30,7 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer', 'CONFIG+=OE_GSTREAMER_ENABLED', '', d)}" EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer010', 'CONFIG+=OE_GSTREAMER010_ENABLED', '', d)}" EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtlocation', 'CONFIG+=OE_QTLOCATION_ENABLED', '', d)}" +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtmultimedia', 'CONFIG+=OE_QTMULTIMEDIA_ENABLED', '', d)}" EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtsensors', 'CONFIG+=OE_QTSENSORS_ENABLED', '', d)}" # qtwebkit gets terribly big when linking with all debug info, disable by default |