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, 2 insertions, 1 deletions

diff --git a/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h b/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h
index cff536f4d..ffa80bd27 100644
--- a/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h
+++ b/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h
@@ -48,6 +48,7 @@
 typedef struct mmr_connection mmr_connection_t;
 typedef struct mmr_context mmr_context_t;
 typedef struct mmrenderer_monitor mmrenderer_monitor_t;
+typedef struct strm_dict strm_dict_t;
 
 QT_BEGIN_NAMESPACE
 
@@ -116,6 +117,7 @@ protected:
     void setMmBufferStatus(const QString &bufferStatus);
     void setMmBufferLevel(const QString &bufferLevel);
     void handleMmStopped();
+    void updateMetaData(const strm_dict_t *dict);
 
     // must be called from subclass dtors (calls virtual function stopMonitoring())
     void destroy();
@@ -132,7 +134,6 @@ private:
     void closeConnection();
     void attach();
     void detach();
-    void updateMetaData();
 
     // All these set the specified value to the backend, but neither emit changed signals
     // nor change the member value.