Changeset 89832 in webkit


Ignore:
Timestamp:
Jun 27, 2011 10:26:32 AM (13 years ago)
Author:
alexis.menard@openbossa.org
Message:

2011-06-27 Alexis Menard <​alexis.menard@openbossa.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Remove Phonon MediaPlayer from the tree.
​https://bugs.webkit.org/show_bug.cgi?id=63448

Remvove from the build.

  • Source/WebKit.pri:

2011-06-27 Alexis Menard <​alexis.menard@openbossa.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Remove Phonon MediaPlayer from the tree.
​https://bugs.webkit.org/show_bug.cgi?id=63448

Remove Phonon mediaplayer as it is unused, not finished and
unmaintained.

  • WebCore.gypi:
  • WebCore.pri:
  • WebCore.pro:
  • features.pri:
  • platform/graphics/MediaPlayer.cpp:
  • platform/graphics/qt/MediaPlayerPrivatePhonon.cpp: Removed.
  • platform/graphics/qt/MediaPlayerPrivatePhonon.h: Removed.

2011-06-27 Alexis Menard <​alexis.menard@openbossa.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Remove Phonon MediaPlayer from the tree.
​https://bugs.webkit.org/show_bug.cgi?id=63448

Remove Phonon related stuff.

  • docs/qtwebkit.qdocconf:
  • qt_webkit_version.pri:
Location:
trunk
Files:
2 deleted
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r89682 r89832  
     12011-06-27  Alexis Menard  <alexis.menard@openbossa.org>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] Remove Phonon MediaPlayer from the tree.
     6        https://bugs.webkit.org/show_bug.cgi?id=63448
     7
     8        Remvove from the build.
     9
     10        * Source/WebKit.pri:
     11
    1122011-06-24  Dominic Cooney  <dominicc@chromium.org>
    213

  • trunk/Source/WebCore/ChangeLog

    r89831 r89832  
     12011-06-27  Alexis Menard  <alexis.menard@openbossa.org>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] Remove Phonon MediaPlayer from the tree.
     6        https://bugs.webkit.org/show_bug.cgi?id=63448
     7
     8        Remove Phonon mediaplayer as it is unused, not finished and
     9        unmaintained.
     10
     11        * WebCore.gypi:
     12        * WebCore.pri:
     13        * WebCore.pro:
     14        * features.pri:
     15        * platform/graphics/MediaPlayer.cpp:
     16        * platform/graphics/qt/MediaPlayerPrivatePhonon.cpp: Removed.
     17        * platform/graphics/qt/MediaPlayerPrivatePhonon.h: Removed.
     18
    1192011-06-27  Ryosuke Niwa  <rniwa@webkit.org>
    220

  • trunk/Source/WebCore/WebCore.gypi

    r89783 r89832  
    44284428            'platform/graphics/qt/IntRectQt.cpp',
    44294429            'platform/graphics/qt/IntSizeQt.cpp',
    4430             'platform/graphics/qt/MediaPlayerPrivatePhonon.cpp',
    4431             'platform/graphics/qt/MediaPlayerPrivatePhonon.h',
    44324430            'platform/graphics/qt/MediaPlayerPrivateQt.cpp',
    44334431            'platform/graphics/qt/MediaPlayerPrivateQt.h',

  • trunk/Source/WebCore/WebCore.pri

    r89516 r89832  
    274274        MOBILITY *= multimedia
    275275        DEFINES  += WTF_USE_QT_MULTIMEDIA=1
    276     } else:contains(QT_CONFIG, phonon) {
    277         # Add phonon manually to prevent it from coming first in
    278         # the include paths, as Phonon's path.h conflicts with
    279         # WebCore's Path.h on case-insensitive filesystems.
    280         qtAddLibrary(phonon)
    281         INCLUDEPATH -= $$QT.phonon.includes
    282         INCLUDEPATH += $$QT.phonon.includes
    283         mac {
    284             INCLUDEPATH -= $$QT.phonon.libs/phonon.framework/Headers
    285             INCLUDEPATH += $$QT.phonon.libs/phonon.framework/Headers
    286         }
    287276    }
    288277}

  • trunk/Source/WebCore/WebCore.pro

    r89783 r89832  
    30603060        SOURCES += \
    30613061            platform/graphics/qt/MediaPlayerPrivateQt.cpp
    3062     } else:contains(QT_CONFIG, phonon) {
    3063         HEADERS += \
    3064             platform/graphics/qt/MediaPlayerPrivatePhonon.h
    3065 
    3066         SOURCES += \
    3067             platform/graphics/qt/MediaPlayerPrivatePhonon.cpp
    30683062    }
    30693063}

  • trunk/Source/WebCore/features.pri

    r89732 r89832  
    180180
    181181# HTML5 Media Support
    182 # We require QtMultimedia or Phonon
     182# We require QtMultimedia
    183183!contains(DEFINES, ENABLE_VIDEO=.) {
    184184    DEFINES -= ENABLE_VIDEO=1
    … …  
    200200        DEFINES -= WTF_USE_QT_MULTIMEDIA=0
    201201        DEFINES += WTF_USE_QT_MULTIMEDIA=1
    202     } else:contains(QT_CONFIG, phonon) {
    203         DEFINES -= ENABLE_VIDEO=0
    204         DEFINES += ENABLE_VIDEO=1
    205         DEFINES -= WTF_USE_QT_MULTIMEDIA=1
    206         DEFINES += WTF_USE_QT_MULTIMEDIA=0
    207202    }
    208203}

  • trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp

    r87312 r89832  
    6363#include "MediaPlayerPrivateQt.h"
    6464#define PlatformMediaEngineClassName MediaPlayerPrivateQt
    65 #elif !USE(GSTREAMER) && !USE(QTKIT)
    66 #include "MediaPlayerPrivatePhonon.h"
    67 #define PlatformMediaEngineClassName MediaPlayerPrivatePhonon
    6865#endif
    6966#elif PLATFORM(CHROMIUM)

  • trunk/Source/WebKit.pri

    r89633 r89832  
    155155disable_uitools: DEFINES *= QT_NO_UITOOLS
    156156
    157 isEmpty(QT.phonon.includes) {
    158     QT.phonon.includes = $$QMAKE_INCDIR_QT/phonon
    159     QT.phonon.libs = $$QMAKE_LIBDIR_QT
    160 }
    161 
    162157# Disable a few warnings on Windows. The warnings are also
    163158# disabled in WebKitLibraries/win/tools/vsprops/common.vsprops

  • trunk/Source/WebKit/qt/ChangeLog

    r89830 r89832  
     12011-06-27  Alexis Menard  <alexis.menard@openbossa.org>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] Remove Phonon MediaPlayer from the tree.
     6        https://bugs.webkit.org/show_bug.cgi?id=63448
     7
     8        Remove Phonon related stuff.
     9
     10        * docs/qtwebkit.qdocconf:
     11        * qt_webkit_version.pri:
     12
    1132011-06-27  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
    214

  • trunk/Source/WebKit/qt/docs/qtwebkit.qdocconf

    r74855 r89832  
    147147                          QT_END_NAMESPACE \
    148148                          QT_END_INCLUDE_NAMESPACE \
    149                           PHONON_EXPORT \
    150149                          EXTENSIONSYSTEM_EXPORT \
    151150                          QWEBKIT_EXPORT
    … …  
    165164                          Q_FLAGS \
    166165                          Q_INTERFACES \
    167                           __attribute__ \
    168                           K_DECLARE_PRIVATE \
    169                           PHONON_OBJECT \
    170                           PHONON_HEIR
     166                          __attribute__
    171167
    172168

  • trunk/Source/WebKit/qt/qt_webkit_version.pri

    r86158 r89832  
    88QT.webkit.sources = $$QT_MODULE_BASE
    99QT.webkit.libs = $$QT_MODULE_LIB_BASE
    10 QT.webkit.depends = core gui opengl network xmlpatterns script phonon
     10QT.webkit.depends = core gui opengl network xmlpatterns script
    1111
    1212!contains(QT_CONFIG, modular)|contains(QT_ELIGIBLE_MODULES, webkit) {
Note: See TracChangeset for help on using the changeset viewer.