diff options
| author | Alex <qt-info@nokia.com> | 2010-06-04 14:32:32 +1000 |
|---|---|---|
| committer | Alex <qt-info@nokia.com> | 2010-06-04 14:32:32 +1000 |
| commit | 162309abe5249746ec2d1bf41cfe43b6246b0342 (patch) | |
| tree | 76f1442756c1951889355cb156f963bfe19f1146 /doc/src/snippets | |
| parent | a2bfcbd995221be8aa6eec980f0dcaed59e4a173 (diff) | |
| parent | 5d7bab66dd1d632c1ef8abaf17d5f1cc50a8dbe8 (diff) | |
Merge branch '1.0' into merge
Conflicts:
doc/html/qmediabindableinterface-members.html
doc/html/qmediaplaylistsourcecontrol-members.html
doc/html/qmetadatacontrol.html
doc/html/qmetadatawritercontrol-members.html
doc/html/qtmultimediakit.html
doc/html/qvideooutputcontrol.html
plugins/sensors/symbian/sensorbackendsym.cpp
Diffstat (limited to 'doc/src/snippets')
| -rw-r--r-- | doc/src/snippets/multimedia-snippets/audiorecorder.cpp | 2 | ||||
| -rw-r--r-- | doc/src/snippets/multimedia-snippets/player.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/snippets/multimedia-snippets/audiorecorder.cpp b/doc/src/snippets/multimedia-snippets/audiorecorder.cpp index fa1ef60d35..fd92026c6b 100644 --- a/doc/src/snippets/multimedia-snippets/audiorecorder.cpp +++ b/doc/src/snippets/multimedia-snippets/audiorecorder.cpp @@ -45,7 +45,7 @@ #include <qmediarecorder.h> #include <qmediaservice.h> -#include <QtMultimedia/qaudioformat.h> +#include <QtMultimediaKit/qaudioformat.h> #include "audiorecorder.h" 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()) |