diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-04-15 09:08:00 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-04-16 03:32:49 (GMT) |
| commit | 441a2dea20b5d4aa2a4d477cf01e0959ac87fe13 (patch) | |
| tree | 4a593284c88995b9c54218da6072aaa702af459e /src/3rdparty/webkit | |
| parent | 2f89bb3c6ec37178ab7bed0e172b61d017e33d75 (diff) | |
| download | Qt-441a2dea20b5d4aa2a4d477cf01e0959ac87fe13.zip Qt-441a2dea20b5d4aa2a4d477cf01e0959ac87fe13.tar.gz Qt-441a2dea20b5d4aa2a4d477cf01e0959ac87fe13.tar.bz2 | |
Create Mediaservices lib, separate from Multimedia.
(cherry picked from commit e85223d233c0e1d6beca748332b8fbaba3ebbf2d)
Diffstat (limited to 'src/3rdparty/webkit')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 4 |
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 |