diff options
author | Brian Jensen <Jensen.J.Brian@gmail.com> | 2013-12-03 12:36:02 (GMT) |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-09 14:17:58 (GMT) |
commit | f44310c25b372f494586dbb5b305f7e81ca63000 (patch) | |
tree | 1544111d57a91519f44384097702a24b619d2fe5 /src/3rdparty | |
parent | 1d48b9ea56e42b2cf963090078ee2162bde23a25 (diff) | |
download | Qt-f44310c25b372f494586dbb5b305f7e81ca63000.zip Qt-f44310c25b372f494586dbb5b305f7e81ca63000.tar.gz Qt-f44310c25b372f494586dbb5b305f7e81ca63000.tar.bz2 |
WebKit: Remove video support on OS X
WebKit video support on OS X currently relies on QTKit to function
properly. This is problematic because QTKit video support in WebKit
requires linking against the WebKitSystemInterface specific to each OS X
release, thus preventing the same set of Qt binaries from interoprating
with several Mac Releases. As a workaround video support is disabled.
Back ported from: http://trac.webkit.org/changeset/151546
Task-number: QTBUG-32237
Change-Id: I780062ce5971960dcad7b51e6226dcf7cd7c907f
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/3rdparty')
-rw-r--r-- | src/3rdparty/webkit/Source/WebCore/WebCore.pri | 9 | ||||
-rw-r--r-- | src/3rdparty/webkit/Source/WebCore/WebCore.pro | 41 | ||||
-rw-r--r-- | src/3rdparty/webkit/Source/WebCore/features.pri | 7 | ||||
-rw-r--r-- | src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro | 34 |
4 files changed, 5 insertions, 86 deletions
diff --git a/src/3rdparty/webkit/Source/WebCore/WebCore.pri b/src/3rdparty/webkit/Source/WebCore/WebCore.pri index d83eec7..6ea37fd 100644 --- a/src/3rdparty/webkit/Source/WebCore/WebCore.pri +++ b/src/3rdparty/webkit/Source/WebCore/WebCore.pri @@ -245,14 +245,7 @@ contains(DEFINES, WTF_USE_QT_BEARER=1) { } contains(DEFINES, ENABLE_VIDEO=1) { - contains(DEFINES, WTF_USE_QTKIT=1) { - INCLUDEPATH += $$PWD/platform/graphics/mac - - LIBS += -framework AppKit -framework AudioUnit \ - -framework AudioToolbox -framework CoreAudio \ - -framework QuartzCore -framework QTKit - - } else:contains(DEFINES, WTF_USE_GSTREAMER=1) { + contains(DEFINES, WTF_USE_GSTREAMER=1) { DEFINES += ENABLE_GLIB_SUPPORT=1 INCLUDEPATH += $$PWD/platform/graphics/gstreamer diff --git a/src/3rdparty/webkit/Source/WebCore/WebCore.pro b/src/3rdparty/webkit/Source/WebCore/WebCore.pro index ceceee8..a0d7d5d 100644 --- a/src/3rdparty/webkit/Source/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/Source/WebCore/WebCore.pro @@ -2940,46 +2940,7 @@ contains(DEFINES, ENABLE_VIDEO=1) { bindings/js/JSAudioConstructor.cpp } - contains(DEFINES, WTF_USE_QTKIT=1) { - INCLUDEPATH += \ - $$SOURCE_DIR/../WebKitLibraries/ - - HEADERS += \ - platform/graphics/mac/MediaPlayerPrivateQTKit.h \ - platform/mac/WebCoreObjCExtras.h \ - platform/qt/WebCoreSystemInterface.h \ - platform/mac/BlockExceptions.h \ - platform/mac/WebCoreObjCExtras.h \ - platform/mac/WebVideoFullscreenController.h \ - platform/mac/WebVideoFullscreenHUDWindowController.h \ - platform/mac/WebWindowAnimation.h - - SOURCES += \ - platform/graphics/cg/IntRectCG.cpp \ - platform/graphics/cg/FloatSizeCG.cpp \ - platform/cf/SharedBufferCF.cpp \ - platform/cf/KURLCFNet.cpp - - OBJECTIVE_SOURCES += \ - platform/qt/WebCoreSystemInterface.mm \ - platform/mac/BlockExceptions.mm \ - platform/mac/WebCoreObjCExtras.mm \ - platform/graphics/mac/MediaPlayerPrivateQTKit.mm \ - platform/mac/SharedBufferMac.mm \ - platform/mac/KURLMac.mm \ - platform/text/mac/StringMac.mm \ - platform/graphics/mac/FloatSizeMac.mm \ - platform/graphics/mac/IntRectMac.mm \ - platform/mac/WebVideoFullscreenController.mm \ - platform/mac/WebVideoFullscreenHUDWindowController.mm \ - platform/mac/WebWindowAnimation.mm - - DEFINES+=NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES - contains(CONFIG, "x86") { - DEFINES+=NS_BUILD_32_LIKE_64 - } - - } else: contains(DEFINES, WTF_USE_GSTREAMER=1) { + contains(DEFINES, WTF_USE_GSTREAMER=1) { HEADERS += \ platform/graphics/gstreamer/GOwnPtrGStreamer.h \ platform/graphics/gstreamer/GRefPtrGStreamer.h \ diff --git a/src/3rdparty/webkit/Source/WebCore/features.pri b/src/3rdparty/webkit/Source/WebCore/features.pri index f04d0b4..612ed8a 100644 --- a/src/3rdparty/webkit/Source/WebCore/features.pri +++ b/src/3rdparty/webkit/Source/WebCore/features.pri @@ -162,12 +162,7 @@ symbian|maemo5|maemo6 { DEFINES -= ENABLE_VIDEO=1 DEFINES += ENABLE_VIDEO=0 - mac:!contains(DEFINES, USE_QTMULTIMEDIA=1) { - DEFINES -= ENABLE_VIDEO=0 - DEFINES += ENABLE_VIDEO=1 - DEFINES += WTF_USE_QTKIT=1 - DEFINES -= WTF_USE_QTKIT=0 - } else: linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) { + linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) { !contains(QT_CONFIG, no-pkg-config):system(pkg-config --exists glib-2.0 gio-2.0 gstreamer-0.10): { DEFINES -= ENABLE_VIDEO=0 DEFINES += ENABLE_VIDEO=1 diff --git a/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro b/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro index d434f12..32798f7 100644 --- a/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro +++ b/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro @@ -217,46 +217,16 @@ contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) { } contains(DEFINES, ENABLE_VIDEO=1) { - !contains(DEFINES, WTF_USE_QTKIT=1):!contains(DEFINES, WTF_USE_GSTREAMER=1):contains(DEFINES, WTF_USE_QT_MULTIMEDIA=1) { + !contains(DEFINES, WTF_USE_GSTREAMER=1):contains(DEFINES, WTF_USE_QT_MULTIMEDIA=1) { HEADERS += $$PWD/WebCoreSupport/FullScreenVideoWidget.h SOURCES += $$PWD/WebCoreSupport/FullScreenVideoWidget.cpp } - contains(DEFINES, WTF_USE_QTKIT=1) | contains(DEFINES, WTF_USE_GSTREAMER=1) | contains(DEFINES, WTF_USE_QT_MULTIMEDIA=1) { + contains(DEFINES, WTF_USE_GSTREAMER=1) | contains(DEFINES, WTF_USE_QT_MULTIMEDIA=1) { HEADERS += $$PWD/WebCoreSupport/FullScreenVideoQt.h SOURCES += $$PWD/WebCoreSupport/FullScreenVideoQt.cpp } - contains(DEFINES, WTF_USE_QTKIT=1) { - INCLUDEPATH += $$SOURCE_DIR/WebCore/platform/qt/ \ - $$SOURCE_DIR/WebCore/platform/mac/ \ - $$SOURCE_DIR/../WebKitLibraries/ - - DEFINES+=NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES - contains(CONFIG, "x86") { - DEFINES+=NS_BUILD_32_LIKE_64 - } - - HEADERS += $$PWD/WebCoreSupport/WebSystemInterface.h \ - $$PWD/WebCoreSupport/QTKitFullScreenVideoHandler.h - - OBJECTIVE_SOURCES += $$PWD/WebCoreSupport/WebSystemInterface.mm \ - $$PWD/WebCoreSupport/QTKitFullScreenVideoHandler.mm - - LIBS+= -framework Security -framework IOKit - # We can know the Mac OS version by using the Darwin major version - DARWIN_VERSION = $$split(QMAKE_HOST.version, ".") - DARWIN_MAJOR_VERSION = $$first(DARWIN_VERSION) - equals(DARWIN_MAJOR_VERSION, "9") | contains(QMAKE_MAC_SDK, ".*MacOSX10.5.sdk") { - LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLeopard.a - } else: equals(DARWIN_MAJOR_VERSION, "10") | contains(QMAKE_MAC_SDK, ".*MacOSX10.6.sdk") { - LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a - } else: equals(DARWIN_MAJOR_VERSION, "11") | contains(QMAKE_MAC_SDK, ".*MacOSX10.7.sdk") { - LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLion.a - } else: equals(DARWIN_MAJOR_VERSION, "12") | contains(QMAKE_MAC_SDK, ".*MacOSX10.8.sdk") { - LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceMountainLion.a - } - } } contains(DEFINES, ENABLE_ICONDATABASE=1) { |