Merge remote-tracking branch 'origin/5.9' into 5.10

 Conflicts:
	.qmake.conf
	examples/multimedia/declarative-radio/view.qml
	src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h

Change-Id: I97b507878b6de04ec38ddd13530e58b8f72390e4

1 files changed, 3 insertions, 6 deletions

diff --git a/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp b/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp
index 83e24dc67..55116f642 100644
--- a/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp
+++ b/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp
@@ -450,8 +450,8 @@ void MmRendererMediaPlayerControl::setMedia(const QMediaContent &media, QIODevic
 
 void MmRendererMediaPlayerControl::continueLoadMedia()
 {
+    updateMetaData(nullptr);
     attach();
-    updateMetaData();
     if (m_playAfterMediaLoaded)
         play();
 }
@@ -578,12 +578,9 @@ void MmRendererMediaPlayerControl::setMmBufferLevel(const QString &bufferLevel)
     }
 }
 
-void MmRendererMediaPlayerControl::updateMetaData()
+void MmRendererMediaPlayerControl::updateMetaData(const strm_dict *dict)
 {
-    if (m_mediaStatus == QMediaPlayer::LoadedMedia)
-        m_metaData.parse(m_contextName);
-    else
-        m_metaData.clear();
+    m_metaData.update(dict);
 
     if (m_videoWindowControl)
         m_videoWindowControl->setMetaData(m_metaData);