Merge remote-tracking branch 'qtyocto/5.13' into dev

* qtyocto/5.13: (46 commits)
  qtwayland: update module
  qt5: update submodules
  qt5: update submodules
  qt3d-runtime: update to v2.3
  qtbase: add no-opengl to PACKAGECONFIG_GL when opengl isn't in DISTRO_FEATURES
  qtbase: add accessibility from PACKAGECONFIG_KDE to PACKAGECONFIG_DEFAULT
  qtbase: add libxext dependency for xcb PACKAGECONFIG
  python-pyqt5: Update to version 5.12.1.
  python-pyqt: Fix annoying problems.
  qtwebengine: arm: use OE specified -mcpu option
  Revert "qtbase: Adjust target mkspec settings"
  qtbase-tools: Fix error during pkg_postinst
  qtwebengine: restore the fix for build with clang/libc++ on aarch64/arm
  qt5: update SRCREVs after v5.12.3 tags were downmerged to 5.12 branch
  qtwayland: check also that the destination for private headers exists before installing them
  qtwayland: improve manual header installation
  qtwayland: workaround upstream bug: install missing headers manually
  qtwayland: disable gold for all archs like in qtbase
  qt5: upgrade to 5.12.3
  qtbase: disable gold for all archs not just x86
  ...

Change-Id: I43d594b17bfeadc102a8817285c5834062e9cd75

1 files changed, 1 insertions, 1 deletions

diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index f632abc0..025f3018 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -28,7 +28,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstream
 CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DMESA_EGL_NO_X11_HEADERS=1', d)}"
 
 # Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.12
-# 5.12.meta-qt5.1
+# 5.12.meta-qt5.3
 SRC_URI += "\
     file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \
 "