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

Conflicts:
	.qmake.conf

Change-Id: I6ea9c40c69f55fa733fd9000a57d570fff21f1e9

src/plugins/plugins.pro

@@ -13,7 +13,8 @@ android {
 }
 
 qnx {
-    SUBDIRS += qnx audiocapture
+    config_mmrenderer: SUBDIRS += qnx
+    SUBDIRS += audiocapture
 }
 
 qnx:!blackberry {

src/plugins/qnx/mediaplayer/mmrenderermetadatareadercontrol.cpp

@@ -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();

src/plugins/wmf/player/mfaudioendpointcontrol.cpp

@@ -60,6 +60,8 @@ void MFAudioEndpointControl::clear()
     foreach (LPWSTR wstrID, m_devices)
          CoTaskMemFree(wstrID);
 
+    m_devices.clear();
+
     if (m_currentActivate)
         m_currentActivate->Release();
     m_currentActivate = NULL;
@@ -130,6 +132,11 @@ IMFActivate*  MFAudioEndpointControl::createActivate()
     clear();
 
     updateEndpoints();
+
+    // Check if an endpoint is available ("Default" is always inserted)
+    if (m_devices.count() <= 1)
+        return NULL;
+
     setActiveOutput(m_defaultEndpoint);
 
     return m_currentActivate;