Changeset 58246 in webkit

Timestamp:

Apr 26, 2010 4:32:09 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-26 Andreas Kling <​andreas.kling@nokia.com>

Reviewed by Tor Arne Vestbø.

[Qt] Fix compilation against Qt 4.7

Some QtMultimedia things have been moved into QtMediaServices
​https://bugs.webkit.org/show_bug.cgi?id=38111

• WebCore.pro:
• platform/graphics/qt/MediaPlayerPrivateQt.cpp: (WebCore::MediaPlayerPrivate::supportsType): (WebCore::MediaPlayerPrivate::totalBytes):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.pro (modified) (1 diff)
• platform/graphics/qt/MediaPlayerPrivateQt.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-26  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] Fix compilation against Qt 4.7
+
+        Some QtMultimedia things have been moved into QtMediaServices
+        https://bugs.webkit.org/show_bug.cgi?id=38111
+
+        * WebCore.pro:
+        * platform/graphics/qt/MediaPlayerPrivateQt.cpp:
+        (WebCore::MediaPlayerPrivate::supportsType):
+        (WebCore::MediaPlayerPrivate::totalBytes):
+
 2010-04-26  Zoltan Herczeg  <zherczeg@webkit.org>
 

trunk/WebCore/WebCore.pro

@@ -2399 +2399 @@
             SOURCES += platform/graphics/qt/MediaPlayerPrivateQt.cpp
 
-            tobe|!tobe: QT += multimedia
+            tobe|!tobe: QT += multimedia mediaservices
         } else {
             HEADERS += \

trunk/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp

@@ -78 +78 @@
         return MediaPlayer::IsNotSupported;
 
-    if (QMediaPlayer::hasSupport(mime, QStringList(codec)) >= QtMultimedia::ProbablySupported)
+    if (QMediaPlayer::hasSupport(mime, QStringList(codec)) >= QtMediaServices::ProbablySupported)
         return MediaPlayer::IsSupported;
 
@@ -345 +345 @@
 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;