diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-04-16 00:19:49 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-04-16 00:19:49 (GMT) |
| commit | be80bdf8bff864a21308ea58829949c84db8dbdf (patch) | |
| tree | a7a5fdafa3f754f7af34b7fe3bb91b39c173b853 /src | |
| parent | 655088bc1942698ee060ca5237a4220365e49ee1 (diff) | |
| parent | cb935bb0fe6289017783223c065637b1defa47e6 (diff) | |
| download | Qt-be80bdf8bff864a21308ea58829949c84db8dbdf.zip Qt-be80bdf8bff864a21308ea58829949c84db8dbdf.tar.gz Qt-be80bdf8bff864a21308ea58829949c84db8dbdf.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7
Diffstat (limited to 'src')
4 files changed, 4 insertions, 4 deletions
diff --git a/src/multimedia/mediaservices/effects/qsoundeffect_pulse_p.cpp b/src/multimedia/mediaservices/effects/qsoundeffect_pulse_p.cpp index e834280..3e3dd91 100644 --- a/src/multimedia/mediaservices/effects/qsoundeffect_pulse_p.cpp +++ b/src/multimedia/mediaservices/effects/qsoundeffect_pulse_p.cpp @@ -51,7 +51,7 @@ // #include <QtCore/qcoreapplication.h> -#include <QtMediaservices/qaudioformat.h> +#include <QtMultimedia/qaudioformat.h> #include <QtNetwork> #include <QTime> 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 bb77eff..5239464 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" |