diff options
-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 | |||
7 | 7 | ||
8 | DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt" | 8 | DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt" |
9 | 9 | ||
10 | PACKAGECONFIG ??= "gstreamer qtlocation qtsensors" | 10 | PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors" |
11 | PACKAGECONFIG[gstreamer] = ",,gstreamer1.0 gstreamer1.0-plugins-base" | 11 | PACKAGECONFIG[gstreamer] = ",,gstreamer1.0 gstreamer1.0-plugins-base" |
12 | PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base" | 12 | PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base" |
13 | PACKAGECONFIG[qtlocation] = ",,qtlocation" | 13 | PACKAGECONFIG[qtlocation] = ",,qtlocation" |
14 | PACKAGECONFIG[qtmultimedia] = ",,qtmultimedia" | ||
14 | PACKAGECONFIG[qtsensors] = ",,qtsensors" | 15 | PACKAGECONFIG[qtsensors] = ",,qtsensors" |
15 | 16 | ||
16 | do_configure_prepend() { | 17 | do_configure_prepend() { |
@@ -20,6 +21,8 @@ do_configure_prepend() { | |||
20 | sed -e 's/\s\(packagesExist(".*\<gstreamer-0.10\>.*")\)/ OE_GSTREAMER010_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf | 21 | sed -e 's/\s\(packagesExist(".*\<gstreamer-0.10\>.*")\)/ OE_GSTREAMER010_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf |
21 | # disable qtlocation test if it isn't enabled by PACKAGECONFIG | 22 | # disable qtlocation test if it isn't enabled by PACKAGECONFIG |
22 | sed -e 's/\s\(qtHaveModule(positioning)\)/ OE_QTLOCATION_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf | 23 | sed -e 's/\s\(qtHaveModule(positioning)\)/ OE_QTLOCATION_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf |
24 | # disable qtmultimedia test if it isn't enabled by PACKAGECONFIG | ||
25 | sed -e 's/(video):\(qtHaveModule(multimediawidgets)\)/(video):OE_QTMULTIMEDIA_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf | ||
23 | # disable qtsensors test if it isn't enabled by PACKAGECONFIG | 26 | # disable qtsensors test if it isn't enabled by PACKAGECONFIG |
24 | sed -e 's/\s\(qtHaveModule(sensors)\)/ OE_QTSENSORS_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf | 27 | sed -e 's/\s\(qtHaveModule(sensors)\)/ OE_QTSENSORS_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf |
25 | } | 28 | } |
@@ -27,6 +30,7 @@ do_configure_prepend() { | |||
27 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer', 'CONFIG+=OE_GSTREAMER_ENABLED', '', d)}" | 30 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer', 'CONFIG+=OE_GSTREAMER_ENABLED', '', d)}" |
28 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer010', 'CONFIG+=OE_GSTREAMER010_ENABLED', '', d)}" | 31 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer010', 'CONFIG+=OE_GSTREAMER010_ENABLED', '', d)}" |
29 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtlocation', 'CONFIG+=OE_QTLOCATION_ENABLED', '', d)}" | 32 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtlocation', 'CONFIG+=OE_QTLOCATION_ENABLED', '', d)}" |
33 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtmultimedia', 'CONFIG+=OE_QTMULTIMEDIA_ENABLED', '', d)}" | ||
30 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtsensors', 'CONFIG+=OE_QTSENSORS_ENABLED', '', d)}" | 34 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtsensors', 'CONFIG+=OE_QTSENSORS_ENABLED', '', d)}" |
31 | 35 | ||
32 | # qtwebkit gets terribly big when linking with all debug info, disable by default | 36 | # qtwebkit gets terribly big when linking with all debug info, disable by default |