diff options
| author | Yoann Lopes <yoann.lopes@qt.io> | 2016-10-11 20:16:38 +0300 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-10-11 20:16:38 +0300 |
| commit | c7433f84288a33d6a5ea411dabf1618afcacfaf1 (patch) | |
| tree | 40fd93907c281b8947bc8db916419e0e9b928c6e /src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.h | |
| parent | 54521ea05d2208a31b6111d5b9248ca7bf2f97ec (diff) | |
| parent | 256ff7bb1551f6c62c4ac861472ea29f45dbab3a (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I8cfa9cb233675bb7ff842118d96ec8ac0b97964f
Diffstat (limited to 'src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.h')
| -rw-r--r-- | src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.h b/src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.h index 6721b0c85..396550047 100644 --- a/src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.h +++ b/src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.h @@ -64,7 +64,7 @@ private Q_SLOTS: private: AVFMediaPlayerSession *m_session; - QMap<QString, QVariant> m_tags; + QVariantMap m_tags; void *m_asset; }; |