diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2014-04-11 00:15:44 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-04-20 16:28:54 +0200 |
| commit | 7a8f5fe098c4a553249710f6869c01bac888d398 (patch) | |
| tree | 36c1090a9409473ba112b67fee5fc2c75ad9ed00 | |
| parent | c49617bd7a7c0f4e9539e64e2468d6ed281540d7 (diff) | |
qtwebkit: fix packageconfig
Arguments passed to the qmake command-line were ignored by prf
files, which get evaluated first. QtWebKit offers QMAKE_CACHE_EVAL,
which can be used to inject a qmake snippet before anything else
gets parsed.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtwebkit.inc | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index a6322cbb..8054e931 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/recipes-qt/qt5/qtwebkit.inc @@ -8,13 +8,14 @@ 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 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" +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" do_configure_prepend() { + export QMAKE_CACHE_EVAL="CONFIG+=${EXTRA_OECONF}" # disable gstreamer-1.0 test if it isn't enabled by PACKAGECONFIG sed -e 's/\s\(packagesExist(".*\<gstreamer-1.0\>.*")\)/ OE_GSTREAMER_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf # disable gstreamer-0.10 test if it isn't enabled by PACKAGECONFIG @@ -27,12 +28,6 @@ do_configure_prepend() { sed -e 's/\s\(qtHaveModule(sensors)\)/ OE_QTSENSORS_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf } -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 QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0" EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}" |