diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-05 17:28:45 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-05 17:28:45 +0200 |
| commit | b017f89f844c09354b50a45fd49fcdcee4f72e43 (patch) | |
| tree | 69385ca1f1a1791582ffc3614605db94a977cf5a /src/3rdparty/webkit/WebCore/WebCore.pro | |
| parent | ffa103af9620998f47c632f4118e789bf7f1cde7 (diff) | |
| download | qt4-tools-b017f89f844c09354b50a45fd49fcdcee4f72e43.tar.gz | |
Updated WebKit to 992e57ee469bd8c6a2afef6b15896a161ab8aeb3
Fixes integrated since the last import:
|| <https://webkit.org/b/38339> || [Qt] Enable JIT for QtWebKit on Symbian ||
|| <https://webkit.org/b/38116> || Media queries empty values ||
|| <https://webkit.org/b/38125> || View modes names in CSSValueKeywords.in ||
Also disabled QtMultimedia support for HTML 5 Audio/Video elements and removed
WebGL support.
Diffstat (limited to 'src/3rdparty/webkit/WebCore/WebCore.pro')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index 3d57562c54..11d3c8bbe5 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -134,17 +134,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 } @@ -2369,8 +2364,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 |