diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-02-28 17:36:22 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-02 16:22:48 +0000 |
commit | 01954b9c65c979e03b7f07ab30889ceb20ed0d05 (patch) | |
tree | e8f03b402cef1271f117667161e128d8c8f71768 /meta/recipes-qt/qt4/qt-4.7.4.inc | |
parent | 2b918b623bf8add454c3726dd4ee189230e6fcbc (diff) | |
download | poky-01954b9c65c979e03b7f07ab30889ceb20ed0d05.tar.gz |
qt4: make pulseaudio support conditional upon DISTRO_FEATURES
Add a pulseaudio DISTRO_FEATURES item and disable pulseaudio support in
phonon within Qt4 if it is not present; otherwise it is a race condition
as to whether it is enabled or disabled or breaks the build.
Note that this adds pulseaudio to DISTRO_FEATURES_BACKFILL thus leaving
existing distro configurations unaffected.
(From OE-Core rev: b82c216c1ee8e2a009e87856b7adad08f7f50482)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt-4.7.4.inc')
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.7.4.inc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.7.4.inc b/meta/recipes-qt/qt4/qt-4.7.4.inc index 216472c3c3..f8956f7bb5 100644 --- a/meta/recipes-qt/qt4/qt-4.7.4.inc +++ b/meta/recipes-qt/qt4/qt-4.7.4.inc | |||
@@ -16,6 +16,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}. | |||
16 | file://fix-translations.patch \ | 16 | file://fix-translations.patch \ |
17 | file://add_nostrip_for_debug_packages.diff \ | 17 | file://add_nostrip_for_debug_packages.diff \ |
18 | file://target_qmake.patch \ | 18 | file://target_qmake.patch \ |
19 | file://pulseaudio-config.patch \ | ||
19 | file://g++.conf \ | 20 | file://g++.conf \ |
20 | file://linux.conf \ | 21 | file://linux.conf \ |
21 | file://fix-qtbug-20925.patch \ | 22 | file://fix-qtbug-20925.patch \ |