summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorThomas McGuire <thomas.mcguire.qnx@kdab.com>2012-07-27 11:37:31 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-28 13:05:30 +0200
commit93823c2251c1a83c233351f8901243715a8ac9e9 (patch)
tree4d8c8ff016136c47448af1824dda6cac18782357 /src/plugins
parent011e151c4e010793a004303c67e0df1aa002dfe2 (diff)
Blackberry: Fix metadata reader for more recent OS versions
Change-Id: I33dae07736eb071f9db3e08c5342921a655ddd57 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/blackberry/bbmetadata.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/blackberry/bbmetadata.cpp b/src/plugins/blackberry/bbmetadata.cpp
index 1e9a174df..0355d630e 100644
--- a/src/plugins/blackberry/bbmetadata.cpp
+++ b/src/plugins/blackberry/bbmetadata.cpp
@@ -64,8 +64,13 @@ static const int mediaTypeVideoFlag = 2;
bool BbMetaData::parse(const QString &contextName)
{
clear();
- const QString fileName =
+ QString fileName =
QString("/pps/services/multimedia/renderer/context/%1/metadata").arg(contextName);
+
+ // In newer OS versions, the filename is "metadata0", not metadata, so try both.
+ if (!QFile::exists(fileName))
+ fileName += '0';
+
QFile metaDataFile(fileName);
if (!metaDataFile.open(QFile::ReadOnly)) {
qWarning() << "Unable to open media metadata file" << fileName << ":"