Merge remote-tracking branch 'origin/fido' into dev

* origin/fido:
  otf-noto: update url and license file name
  qtmultimedia: make sure audio plugins are built
  qt5: update submodules and meta-qt5

Conflicts:
	conf/distro/b2qt.conf
	recipes-qt/qt5/nativesdk-qtbase_git.bbappend
	recipes-qt/qt5/qt3d_git.bbappend
	recipes-qt/qt5/qtbase-native_git.bbappend
	recipes-qt/qt5/qtbase_git.bbappend
	recipes-qt/qt5/qtconnectivity_git.bbappend
	recipes-qt/qt5/qtdeclarative_git.bbappend
	recipes-qt/qt5/qtlocation_git.bbappend
	recipes-qt/qt5/qtmultimedia_git.bbappend
	recipes-qt/qt5/qtquickcontrols2_git.bb
	recipes-qt/qt5/qtquickcontrols_git.bbappend
	recipes-qt/qt5/qtserialbus_git.bb
	recipes-qt/qt5/qtsvg_git.bbappend
	recipes-qt/qt5/qttools_git.bbappend
	recipes-qt/qt5/qttranslations_git.bbappend
	recipes-qt/qt5/qtwayland-native_git.bbappend
	recipes-qt/qt5/qtwayland_git.bbappend
	recipes-qt/qt5/qtwebengine_git.bbappend
	recipes-qt/qt5/qtwebsockets_git.bbappend
	recipes-qt/qt5/qtxmlpatterns_git.bbappend
	scripts/manifest.xml

Change-Id: I54a02e91a49a3be3fa6359b5af69929d63b962e4

1 files changed, 3 insertions, 1 deletions

diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend
index c17ad80..16561f8 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bbappend
+++ b/recipes-qt/qt5/qtmultimedia_git.bbappend
@@ -27,6 +27,8 @@
 ##
 ############################################################################
 
-PACKAGECONFIG += "${@base_contains("DISTRO_FEATURES", "gstreamer010", "gstreamer010", "gstreamer", d)}"
+PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \
+                  ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
+                  ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer010', 'gstreamer010', 'gstreamer', d)}"
 
 SRCREV = "f2b9fb776b78fc10424c0325ab4316a45360130e"