diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-04-15 23:41:10 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-04-16 03:37:27 (GMT) |
| commit | bdc126ef33a11af88a664ea259f3b3d1638fb8e5 (patch) | |
| tree | 08ae42773babeb91c0d5c0fc08e1ac3cc4c59152 | |
| parent | 441a2dea20b5d4aa2a4d477cf01e0959ac87fe13 (diff) | |
| download | Qt-bdc126ef33a11af88a664ea259f3b3d1638fb8e5.zip Qt-bdc126ef33a11af88a664ea259f3b3d1638fb8e5.tar.gz Qt-bdc126ef33a11af88a664ea259f3b3d1638fb8e5.tar.bz2 | |
Fixed compile errors with gstreamer plugin
Reviewed-by:Justin McPherson
(cherry picked from commit ba0d2829f3e173d4c95c49f3bbbe0cd030ff3f5f)
3 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp index 05b924a..51d68f9 100644 --- a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp +++ b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp @@ -172,7 +172,7 @@ QList<QtMediaservices::MetaData> QGstreamerMetaDataProvider::availableMetaData() QList<QtMediaservices::MetaData> res; foreach (const QByteArray &key, m_session->tags().keys()) { - QtMediaservices::MetaData tag = keysMap.value(key, QtMultimedia::MetaData(-1)); + QtMediaservices::MetaData tag = keysMap.value(key, QtMediaservices::MetaData(-1)); if (tag != -1) res.append(tag); } diff --git a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayercontrol.h b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayercontrol.h index 1cfabb3..19fa170 100644 --- a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayercontrol.h +++ b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayercontrol.h @@ -44,7 +44,7 @@ #include <QtCore/qobject.h> -#include <QtMediaservies/qmediaplayercontrol.h> +#include <QtMediaservices/qmediaplayercontrol.h> #include <QtMediaservices/qmediaplayer.h> #include <limits.h> diff --git a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayerservice.h b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayerservice.h index f60c72e..fe4a8a9 100644 --- a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayerservice.h +++ b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayerservice.h @@ -45,7 +45,7 @@ #include <QtCore/qobject.h> #include <QtCore/qiodevice.h> -#include <QtMultimedia/qmediaservice.h> +#include <QtMediaservices/qmediaservice.h> #include "qgstreamervideooutputcontrol.h" |