summaryrefslogtreecommitdiffstats
path: root/src/multimedia/playback
diff options
context:
space:
mode:
authorJustin McPherson <justin.mcpherson@nokia.com>2010-02-19 06:16:44 (GMT)
committerJustin McPherson <justin.mcpherson@nokia.com>2010-02-19 06:16:44 (GMT)
commitf80b82ed61bece1843c6ae011fb5678ba8210949 (patch)
tree9c7cf3c697d2b046832d7422e2afe95e25d3a052 /src/multimedia/playback
parent50fe29b569849d05db1625fa30fbd8618a941c5a (diff)
downloadQt-f80b82ed61bece1843c6ae011fb5678ba8210949.zip
Qt-f80b82ed61bece1843c6ae011fb5678ba8210949.tar.gz
Qt-f80b82ed61bece1843c6ae011fb5678ba8210949.tar.bz2
Change namespace; QtMedia -> QtMultimedia
Diffstat (limited to 'src/multimedia/playback')
-rw-r--r--src/multimedia/playback/qmediaplayer.cpp2
-rw-r--r--src/multimedia/playback/qmediaplayer.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index 6ce34ab..5f50fdb 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -645,7 +645,7 @@ void QMediaPlayer::unbind(QObject *obj)
The \a flags argument allows additional requirements such as performance indicators to be
specified.
*/
-QtMedia::SupportEstimate QMediaPlayer::hasSupport(const QString &mimeType,
+QtMultimedia::SupportEstimate QMediaPlayer::hasSupport(const QString &mimeType,
const QStringList& codecs,
Flags flags)
{
diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h
index 91d6790..1b761ce 100644
--- a/src/multimedia/playback/qmediaplayer.h
+++ b/src/multimedia/playback/qmediaplayer.h
@@ -116,7 +116,7 @@ public:
QMediaPlayer(QObject *parent = 0, Flags flags = 0, QMediaServiceProvider *provider = QMediaServiceProvider::defaultServiceProvider());
~QMediaPlayer();
- static QtMedia::SupportEstimate hasSupport(const QString &mimeType,
+ static QtMultimedia::SupportEstimate hasSupport(const QString &mimeType,
const QStringList& codecs = QStringList(),
Flags flags = 0);
static QStringList supportedMimeTypes(Flags flags = 0);