diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-05-27 12:58:15 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-30 22:26:14 +0100 |
commit | 5cc614ed68d9f763041e4d67134c5d7ada795978 (patch) | |
tree | 79194b482d2656e57c71276b7d2c920f3e78ecb2 /meta/recipes-qt | |
parent | 1d0e21702324e24625e35a3c6b89df5623d4704f (diff) | |
download | poky-5cc614ed68d9f763041e4d67134c5d7ada795978.tar.gz |
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.
(From OE-Core rev: 968973d55d4b33e1a929ed4cdf9387fcaba2d93f)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 1 |
1 files changed, 1 insertions, 0 deletions
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 \ | |||
25 | -system-libjpeg -system-libpng -system-libtiff -system-zlib \ | 25 | -system-libjpeg -system-libpng -system-libtiff -system-zlib \ |
26 | -no-pch -stl -glib -icu \ | 26 | -no-pch -stl -glib -icu \ |
27 | -no-rpath -silent \ | 27 | -no-rpath -silent \ |
28 | -D USE_QTMULTIMEDIA=1 \ | ||
28 | ${QT_DBUS} \ | 29 | ${QT_DBUS} \ |
29 | ${QT_QT3SUPPORT} \ | 30 | ${QT_QT3SUPPORT} \ |
30 | ${QT_WEBKIT} \ | 31 | ${QT_WEBKIT} \ |