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

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

Browse Source 
Change-Id: I9ad818eecef74983e09660871f39ee66a6b666a1
This commit is contained in:
Frederik Gladhorn
2013-06-25 23:27:28 +02:00
parent f424e8249b 1c0cfdf408
commit 18a8381ab3
22 changed files with 84 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/multimedia/qmediapluginloader.cpp
View File

@@ -127,7 +127,12 @@ void QMediaPluginLoader::loadMetadata()
qDebug() << "QMediaPluginLoader: Inserted index " << i << " into metadata: " << jsonobj;
#endif
QJsonArray arr = jsonobj.value(QStringLiteral("Keys")).toArray();
QJsonArray arr = jsonobj.value(QStringLiteral("Services")).toArray();
// Preserve compatibility with older plugins (made before 5.1) in which
// services were declared in the 'Keys' property
if (arr.isEmpty())
arr = jsonobj.value(QStringLiteral("Keys")).toArray();
foreach (QJsonValue value, arr) {
QString key = value.toString();