Commit 221c5f40 authored by hausmann@webkit.org's avatar hausmann@webkit.org

[Qt] Disable Qt Multimedia backend for HTML 5 Audio and Video elements

Reviewed by Tor Arne Vestbø.

Fall back to the Phonon backend until the release situation has been cleared up.

* WebCore.pro:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@58810 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent df4f922c
2010-05-05 Simon Hausmann <simon.hausmann@nokia.com>
Reviewed by Tor Arne Vestbø.
[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.
* WebCore.pro:
2010-05-05 Ilya Tikhonovsky <loislo@chromium.org>
Reviewed by Pavel Feldman.
......@@ -135,17 +135,12 @@ addJavaScriptCoreLib(../JavaScriptCore)
# HTML5 Media Support
# We require phonon for versions of Qt < 4.7
# We require QtMultimedia for versions of Qt >= 4.7
# We require phonon. QtMultimedia support is disabled currently.
!contains(DEFINES, ENABLE_VIDEO=.) {
DEFINES -= ENABLE_VIDEO=1
DEFINES += ENABLE_VIDEO=0
lessThan(QT_MINOR_VERSION, 7):contains(QT_CONFIG, phonon) {
DEFINES -= ENABLE_VIDEO=0
DEFINES += ENABLE_VIDEO=1
}
!lessThan(QT_MINOR_VERSION, 7):contains(QT_CONFIG, mediaservices) {
contains(QT_CONFIG, phonon) {
DEFINES -= ENABLE_VIDEO=0
DEFINES += ENABLE_VIDEO=1
}
......@@ -2406,8 +2401,8 @@ contains(DEFINES, ENABLE_VIDEO=1) {
rendering/RenderMedia.cpp \
bindings/js/JSAudioConstructor.cpp
# QtMultimedia since 4.7
greaterThan(QT_MINOR_VERSION, 6) {
# QtMultimedia disabled currently
false:greaterThan(QT_MINOR_VERSION, 6) {
HEADERS += platform/graphics/qt/MediaPlayerPrivateQt.h
SOURCES += platform/graphics/qt/MediaPlayerPrivateQt.cpp
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment