1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 09f6d93757..6d679940d4 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -1,6 +1,6 @@
 inherit qmake_base
-DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3 tiff icu"
+DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 sqlite3 tiff icu"
 DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
 require qt4_arch.inc
@@ -16,7 +16,7 @@ QT_GLFLAGS ?= ""
 QT_QT3SUPPORT ?= "-qt3support"
 QT_XML ?= "-xmlpatterns"
 QT_WEBKIT ?= "-webkit"
-QT_PHONON ?= "-phonon"
+QT_PHONON ?= "-no-phonon"
 QT_DBUS ?= "-qdbus"
 QT_MULTIMEDIA ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', '-pulseaudio', '-no-pulseaudio', d)}"

diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 09f6d93757..6d679940d4 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc
@@ -1,6 +1,6 @@
1	inherit qmake_base	1	inherit qmake_base
2		2
3	DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3 tiff icu"	3	DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 sqlite3 tiff icu"
4	DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"	4	DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
5		5
6	require qt4_arch.inc	6	require qt4_arch.inc
@@ -16,7 +16,7 @@ QT_GLFLAGS ?= ""
16	QT_QT3SUPPORT ?= "-qt3support"	16	QT_QT3SUPPORT ?= "-qt3support"
17	QT_XML ?= "-xmlpatterns"	17	QT_XML ?= "-xmlpatterns"
18	QT_WEBKIT ?= "-webkit"	18	QT_WEBKIT ?= "-webkit"
19	QT_PHONON ?= "-phonon"	19	QT_PHONON ?= "-no-phonon"
20	QT_DBUS ?= "-qdbus"	20	QT_DBUS ?= "-qdbus"
21	QT_MULTIMEDIA ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', '-pulseaudio', '-no-pulseaudio', d)}"	21	QT_MULTIMEDIA ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', '-pulseaudio', '-no-pulseaudio', d)}"
22		22