Changeset 78834 in webkit


Ignore:
Timestamp:
Feb 17, 2011 8:27:55 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-02-17 Kristian Amlie <​kristian.amlie@nokia.com>

Reviewed by Laszlo Gombos.

Updated include paths for phonon.

[Qt] WebKit patches required to work with a modularized version of Qt
​https://bugs.webkit.org/show_bug.cgi?id=53916

  • Source/WebKit.pri:

2011-02-17 Kristian Amlie <​kristian.amlie@nokia.com>

Reviewed by Laszlo Gombos.

Updated include paths for phonon.

[Qt] WebKit patches required to work with a modularized version of Qt
​https://bugs.webkit.org/show_bug.cgi?id=53916

Build fix. No tests.

  • WebCore.pro:
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r78456 r78834  
     12011-02-17  Kristian Amlie  <kristian.amlie@nokia.com>
     2
     3        Reviewed by Laszlo Gombos.
     4
     5        Updated include paths for phonon.
     6
     7        [Qt] WebKit patches required to work with a modularized version of Qt
     8        https://bugs.webkit.org/show_bug.cgi?id=53916
     9
     10        * Source/WebKit.pri:
     11
    1122011-02-13  Hayato Ito  <hayato@chromium.org>
    213

  • trunk/Source/WebCore/ChangeLog

    r78817 r78834  
     12011-02-17  Kristian Amlie  <kristian.amlie@nokia.com>
     2
     3        Reviewed by Laszlo Gombos.
     4
     5        Updated include paths for phonon.
     6
     7        [Qt] WebKit patches required to work with a modularized version of Qt
     8        https://bugs.webkit.org/show_bug.cgi?id=53916
     9
     10        Build fix. No tests.
     11
     12        * WebCore.pro:
     13
    1142011-02-17  Hui Huang  <hui.2.huang@nokia.com>
    215

  • trunk/Source/WebCore/WebCore.pro

    r78585 r78834  
    32003200        # WebCore's Path.h on case-insensitive filesystems.
    32013201        qtAddLibrary(phonon)
    3202         INCLUDEPATH -= $$QMAKE_INCDIR_QT/phonon
    3203         INCLUDEPATH += $$QMAKE_INCDIR_QT/phonon
     3202        INCLUDEPATH -= $$QT.phonon.includes
     3203        INCLUDEPATH += $$QT.phonon.includes
    32043204        mac {
    3205             INCLUDEPATH -= $$QMAKE_LIBDIR_QT/phonon.framework/Headers
    3206             INCLUDEPATH += $$QMAKE_LIBDIR_QT/phonon.framework/Headers
     3205            INCLUDEPATH -= $$QT.phonon.libs/phonon.framework/Headers
     3206            INCLUDEPATH += $$QT.phonon.libs/phonon.framework/Headers
    32073207        }
    32083208    }

  • trunk/Source/WebKit.pri

    r78013 r78834  
    103103disable_uitools: DEFINES *= QT_NO_UITOOLS
    104104
     105!contains(QT_CONFIG, modular) {
     106    $$QT.phonon.includes = $QMAKE_INCDIR_QT/phonon
     107    $$QT.phonon.libs = $$QMAKE_LIBDIR_QT
     108}
     109
    105110# Disable a few warnings on Windows. The warnings are also
    106111# disabled in WebKitLibraries/win/tools/vsprops/common.vsprops
Note: See TracChangeset for help on using the changeset viewer.