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

Rename QtMultimediaKit to QtMultimedia.

Browse Source 
There are a few legacy bits left in place so it passes CI, and
then qt5.git etc can be updated.

Change-Id: I6b082e50e6958c72fdabc2974992e16d90dafa3a
Reviewed-on: http://codereview.qt-project.org/5368
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Michael Goddard
2011-10-06 14:31:58 +10:00
committed by Qt by Nokia
parent 55bc4f2b46
commit 03f22bcdaf
395 changed files with 1393 additions and 3088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/player/player.cpp
View File

@@ -221,14 +221,14 @@ void Player::positionChanged(qint64 progress)
void Player::metaDataChanged()
{
//qDebug() << "update metadata" << player->metaData(QtMultimediaKit::Title).toString();
//qDebug() << "update metadata" << player->metaData(QtMultimedia::Title).toString();
if (player->isMetaDataAvailable()) {
setTrackInfo(QString("%1 - %2")
.arg(player->metaData(QtMultimediaKit::AlbumArtist).toString())
.arg(player->metaData(QtMultimediaKit::Title).toString()));
.arg(player->metaData(QtMultimedia::AlbumArtist).toString())
.arg(player->metaData(QtMultimedia::Title).toString()));
if (coverLabel) {
QUrl url = player->metaData(QtMultimediaKit::CoverArtUrlLarge).value<QUrl>();
QUrl url = player->metaData(QtMultimedia::CoverArtUrlLarge).value<QUrl>();
coverLabel->setPixmap(!url.isEmpty()
? QPixmap(url.toString())

8
examples/player/player.pro
View File

@@ -5,8 +5,8 @@ CONFIG += qt warn_on
QT += network \
xml \
multimediakit \
multimediakitwidgets
multimedia \
multimediawidgets
HEADERS = \
player.h \
@@ -24,9 +24,9 @@ maemo* {
}
#install
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/player
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/player
sources.files = $$SOURCES $HEADERS $$RESOURCES $$FORMS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/player
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/player
INSTALLS += target sources
QT+=widgets

2
examples/player/playlistmodel.h
View File

@@ -41,7 +41,7 @@
#ifndef PLAYLISTMODEL_H
#define PLAYLISTMODEL_H
#include <qtmultimediakitdefs.h>
#include <qtmultimediadefs.h>
#include <QtCore/qabstractitemmodel.h>
QT_BEGIN_NAMESPACE