summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorJustin McPherson <justin.mcpherson@nokia.com>2010-04-15 09:08:00 (GMT)
committerJustin McPherson <justin.mcpherson@nokia.com>2010-04-15 09:08:00 (GMT)
commite85223d233c0e1d6beca748332b8fbaba3ebbf2d (patch)
tree3f6b3df4e7255403ed1b26413240ea7008bf5883 /src/3rdparty
parent29bb0a4f0fc135337658e5fa273edb06eefaae3d (diff)
downloadQt-e85223d233c0e1d6beca748332b8fbaba3ebbf2d.zip
Qt-e85223d233c0e1d6beca748332b8fbaba3ebbf2d.tar.gz
Qt-e85223d233c0e1d6beca748332b8fbaba3ebbf2d.tar.bz2
Create Mediaservices lib, separate from Multimedia.
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/webkit/WebCore/WebCore.pro4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
index bdb3f83..22c39b6 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -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
}
@@ -2370,7 +2370,7 @@ contains(DEFINES, ENABLE_VIDEO=1) {
HEADERS += platform/graphics/qt/MediaPlayerPrivateQt.h
SOURCES += platform/graphics/qt/MediaPlayerPrivateQt.cpp
- tobe|!tobe: QT += multimedia
+ tobe|!tobe: QT += mediaservices
} else {
HEADERS += \
platform/graphics/qt/MediaPlayerPrivatePhonon.h