diff options
| author | abcd <qt-info@nokia.com> | 2010-06-11 11:15:52 +1000 |
|---|---|---|
| committer | abcd <qt-info@nokia.com> | 2010-06-11 11:15:52 +1000 |
| commit | 65a0ce6e97a40e848dd60ba7d7931e4d77d66fe3 (patch) | |
| tree | 05d04c19aade52d54e7f3e10067dee6305f0e66f /doc/src/snippets/multimedia-snippets/player.cpp | |
| parent | 84c09aedc7052c35d3d2f29d392310b3f206a36f (diff) | |
| parent | b1e64744dcae67e79e59807d18963080315577eb (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtmobility
Conflicts:
doc/html/annotated.html
doc/html/classes.html
doc/html/functions.html
doc/html/hierarchy.html
doc/html/location-overview.html
doc/html/qt-mobility-project-library.dcf
doc/html/qt-mobility-project-library.index
doc/html/qtmobility.qhp
examples/examples.pro
src/global/qmobilityglobal.h
Diffstat (limited to 'doc/src/snippets/multimedia-snippets/player.cpp')
| -rw-r--r-- | doc/src/snippets/multimedia-snippets/player.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/snippets/multimedia-snippets/player.cpp b/doc/src/snippets/multimedia-snippets/player.cpp index e2cf670969..db93734379 100644 --- a/doc/src/snippets/multimedia-snippets/player.cpp +++ b/doc/src/snippets/multimedia-snippets/player.cpp @@ -177,14 +177,14 @@ void Player::positionChanged(qint64 progress) void Player::metaDataChanged() { - //qDebug() << "update metadata" << player->metaData(QtMediaServices::Title).toString(); + //qDebug() << "update metadata" << player->metaData(QtMultimediaKit::Title).toString(); if (player->isMetaDataAvailable()) { setTrackInfo(QString("%1 - %2") - .arg(player->metaData(QtMediaServices::AlbumArtist).toString()) - .arg(player->metaData(QtMediaServices::Title).toString())); + .arg(player->metaData(QtMultimediaKit::AlbumArtist).toString()) + .arg(player->metaData(QtMultimediaKit::Title).toString())); if (coverLabel) { - QUrl url = player->metaData(QtMediaServices::CoverArtUrlLarge).value<QUrl>(); + QUrl url = player->metaData(QtMultimediaKit::CoverArtUrlLarge).value<QUrl>(); coverLabel->setPixmap(!url.isEmpty() ? QPixmap(url.toString()) |