summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin McPherson <justin.mcpherson@nokia.com>2010-04-16 02:24:01 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2010-04-16 03:39:10 (GMT)
commit9519073bf55de7a1a22a4f756afb35fa1f87fe46 (patch)
tree01d1892b2abf25c1ff04b1ecffede0a2be41f3c2
parent361c347ddc0117df593ef8ab107cdae1065aac83 (diff)
downloadQt-9519073bf55de7a1a22a4f756afb35fa1f87fe46.zip
Qt-9519073bf55de7a1a22a4f756afb35fa1f87fe46.tar.gz
Qt-9519073bf55de7a1a22a4f756afb35fa1f87fe46.tar.bz2
WebKit; build with change to mediaservices.
Reviewed-by: Dmytro Poplavskiy (cherry picked from commit 690e0f27ae23189200d98e9300b63914d8e1fe30)
-rw-r--r--src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
index 66ffe23..5db94a8 100644
--- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
@@ -77,7 +77,7 @@ MediaPlayer::SupportsType MediaPlayerPrivate::supportsType(const String& mime, c
if (!mime.startsWith("audio/") && !mime.startsWith("video/"))
return MediaPlayer::IsNotSupported;
- if (QMediaPlayer::hasSupport(mime, QStringList(codec)) >= QtMultimedia::ProbablySupported)
+ if (QMediaPlayer::hasSupport(mime, QStringList(codec)) >= QtMediaServices::ProbablySupported)
return MediaPlayer::IsSupported;
return MediaPlayer::MayBeSupported;
@@ -344,8 +344,8 @@ unsigned MediaPlayerPrivate::bytesLoaded() const
unsigned MediaPlayerPrivate::totalBytes() const
{
- if (m_mediaPlayer->availableMetaData().contains(QtMultimedia::Size))
- return m_mediaPlayer->metaData(QtMultimedia::Size).toInt();
+ if (m_mediaPlayer->availableMetaData().contains(QtMediaServices::Size))
+ return m_mediaPlayer->metaData(QtMediaServices::Size).toInt();
return 100;
}