diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-06 05:10:04 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-06 05:10:04 (GMT) |
| commit | 91b2bd620bf10ddd9de65f2c3ac7781e591844d4 (patch) | |
| tree | 16683c27cc28dd8fbd3757583b93819fc501499e /src | |
| parent | 378335c8efc2df04692d0d51618b1e305a24ace7 (diff) | |
| download | Qt-91b2bd620bf10ddd9de65f2c3ac7781e591844d4.zip Qt-91b2bd620bf10ddd9de65f2c3ac7781e591844d4.tar.gz Qt-91b2bd620bf10ddd9de65f2c3ac7781e591844d4.tar.bz2 | |
Updated WebKit to e4b73bb0b173f21db8f0de3dae885a8a71282996
Integrated Ossy's fix for building without Qt Multimedia
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/webkit/.tag | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/VERSION | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/ChangeLog | 13 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/platform/graphics/MediaPlayer.cpp | 3 |
4 files changed, 17 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag index d0dcced..171d97b 100644 --- a/src/3rdparty/webkit/.tag +++ b/src/3rdparty/webkit/.tag @@ -1 +1 @@ -e4b73bb0b173f21db8f0de3dae885a8a71282996 +07b60cf799680fcfb7785ee88e14f8030a5dbfa2 diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index d4036b4..4dea1b3 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from and has the sha1 checksum - 992e57ee469bd8c6a2afef6b15896a161ab8aeb3 + e4b73bb0b173f21db8f0de3dae885a8a71282996 diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index 37fa8e4..58b724a 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,16 @@ +2010-05-05 Csaba Osztrogonác <ossy@webkit.org> + + Reviewed by Simon Hausmann. + + [Qt]Disable Qt Multimedia backend for HTML 5 Audio and Video elements + Fall back to the Phonon backend until the release situation has been cleared up. + + https://bugs.webkit.org/show_bug.cgi?id=38612 + + Buildfix for QT_VERSION >= 0x040700 after r58810. + + * platform/graphics/MediaPlayer.cpp: + 2010-05-03 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> Reviewed by Simon Hausmann. diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/MediaPlayer.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/MediaPlayer.cpp index 1fdc1e5..e93a090 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/MediaPlayer.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/MediaPlayer.cpp @@ -50,7 +50,8 @@ #elif PLATFORM(GTK) #include "MediaPlayerPrivateGStreamer.h" #elif PLATFORM(QT) -#if QT_VERSION < 0x040700 +// QtMultimedia support is disabled currently. +#if true || (QT_VERSION < 0x040700) #include "MediaPlayerPrivatePhonon.h" #else #include "MediaPlayerPrivateQt.h" |