slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Conflicts:
	.qmake.conf

Change-Id: I6ea9c40c69f55fa733fd9000a57d570fff21f1e9
This commit is contained in:
Frederik Gladhorn
2013-11-29 16:03:52 +01:00
parent 0c8be63708 9b7fd8c769
commit c5706f05a8
13 changed files with 95 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qnx/mediaplayer/mmrenderermetadatareadercontrol.cpp
View File

@@ -57,7 +57,7 @@ QVariant MmRendererMetaDataReaderControl::metaData(const QString &key) const
{
if (key == QMediaMetaData::Title)
return m_metaData.title();
else if (key == QMediaMetaData::Author)
else if (key == QMediaMetaData::AlbumArtist)
return m_metaData.artist();
else if (key == QMediaMetaData::Comment)
return m_metaData.comment();