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 <o...@opendreambox.org>
---
recipes-qt/qt5/qtwebkit.inc | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc
index 90bd981..61cf155 100644
--- a/recipes-qt/qt5/qtwebkit.inc
+++ b/recipes-qt/qt5/qtwebkit.inc
@@ -8,12 +8,13 @@ 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] = ",,gstreamer1.0 gstreamer1.0-plugins-base"
-PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base"
-PACKAGECONFIG[qtlocation] = ",,qtlocation"
-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[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
@@ -24,11 +25,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', '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}"
--
1.8.3.2
--
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
