Changeset 58390 in webkit


Ignore:
Timestamp:
Apr 28, 2010 1:29:03 AM (14 years ago)
Author:
Simon Hausmann
Message:

[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:
Location:
trunk/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r58389 r58390  
     12010-04-28  Justin McPherson <justin.mcpherson@nokia.com>
     2
     3        Reviewed by Simon Hausmann.
     4
     5        [Qt] Fix detection of Qt 4.7's multimedia libraries
     6
     7        QtMultimedia has been split into an additional media services library, which
     8        we're using. mediaservices depends on multimedia.
     9
     10        * WebCore.pro:
     11
    1122010-04-28  Shinichiro Hamaji  <hamaji@chromium.org>
    213

  • trunk/WebCore/WebCore.pro

    r58379 r58390  
    143143        DEFINES += ENABLE_VIDEO=1
    144144    }
    145     !lessThan(QT_MINOR_VERSION, 7):contains(QT_CONFIG, multimedia) {
     145    !lessThan(QT_MINOR_VERSION, 7):contains(QT_CONFIG, mediaservices) {
    146146        DEFINES -= ENABLE_VIDEO=0
    147147        DEFINES += ENABLE_VIDEO=1
    … …  
    23962396            SOURCES += platform/graphics/qt/MediaPlayerPrivateQt.cpp
    23972397
    2398             tobe|!tobe: QT += multimedia mediaservices
     2398            tobe|!tobe: QT += mediaservices
    23992399        } else {
    24002400            HEADERS += \
Note: See TracChangeset for help on using the changeset viewer.