From: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Date: Wed, 27 May 2015 09:58:15 +0000 (+0300)
Subject: qt4: unconditionally disable gstreamer 0.10 support in qt webkit
X-Git-Tag: 2015-10~1691
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=968973d55d4b33e1a929ed4cdf9387fcaba2d93f;p=openembedded-core.git

qt4: unconditionally disable gstreamer 0.10 support in qt webkit

Previously it was auto-detected in a broken way, which was causing build errors
for qt-mobility. Qt4 build will fail if some gstreamer 0.10 packages are
available at build time, but not all. It will not fail if none of
the packages are available or if all of them are available. We can't guarantee either,
hence this patch.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 6d679940d4..2175fc0de7 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -25,6 +25,7 @@ QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \
                     -system-libjpeg -system-libpng -system-libtiff -system-zlib \
                     -no-pch -stl -glib -icu \
                     -no-rpath -silent \
+		    -D USE_QTMULTIMEDIA=1 \
                     ${QT_DBUS} \
                     ${QT_QT3SUPPORT} \
                     ${QT_WEBKIT} \