Commit 59ca134a authored by hausmann@webkit.org's avatar hausmann@webkit.org
Browse files

[Qt] Fix detection of Qt 4.7's multimedia libraries

Patch by Justin McPherson <justin.mcpherson@nokia.com> on 2010-04-28
Reviewed by Simon Hausmann.

QtMultimedia has been split into an additional media services library, which
we're using. mediaservices depends on multimedia.

* WebCore.pro:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@58390 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 3ba6d93e
2010-04-28 Justin McPherson <justin.mcpherson@nokia.com>
Reviewed by Simon Hausmann.
[Qt] Fix detection of Qt 4.7's multimedia libraries
QtMultimedia has been split into an additional media services library, which
we're using. mediaservices depends on multimedia.
* WebCore.pro:
2010-04-28 Shinichiro Hamaji <hamaji@chromium.org>
 
Unreviewed attempt to fix the chromium build.
......@@ -142,7 +142,7 @@ addJavaScriptCoreLib(../JavaScriptCore)
DEFINES -= ENABLE_VIDEO=0
DEFINES += ENABLE_VIDEO=1
}
!lessThan(QT_MINOR_VERSION, 7):contains(QT_CONFIG, multimedia) {
!lessThan(QT_MINOR_VERSION, 7):contains(QT_CONFIG, mediaservices) {
DEFINES -= ENABLE_VIDEO=0
DEFINES += ENABLE_VIDEO=1
}
......@@ -2395,7 +2395,7 @@ contains(DEFINES, ENABLE_VIDEO=1) {
HEADERS += platform/graphics/qt/MediaPlayerPrivateQt.h
SOURCES += platform/graphics/qt/MediaPlayerPrivateQt.cpp
tobe|!tobe: QT += multimedia mediaservices
tobe|!tobe: QT += mediaservices
} else {
HEADERS += \
platform/graphics/qt/MediaPlayerPrivatePhonon.h
......
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