diff options
| author | Michael Brüning <michael.bruning@digia.com> | 2013-06-13 18:45:09 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-13 21:46:11 +0200 |
| commit | 0368bb7e2682d0b187d31bb91618632965351e4d (patch) | |
| tree | 0e74108483ce5060bd8489a563b4454b70d6d643 /Source | |
| parent | 1810e3848d15ffbe9529f53866fc0ede8d947fef (diff) | |
| download | qtwebkit-0368bb7e2682d0b187d31bb91618632965351e4d.tar.gz | |
[Qt][Mac] Disable QTKit video on OS X.v5.1.0-rc2v5.1.0
https://bugs.webkit.org/show_bug.cgi?id=117591
Reviewed by Tor Arne Vestbø.
Source/WebCore:
Deployment of the same Qt binaries to different
Mac OS X version makes it impossible to link against
the correct WebKitSystemInterface version at build time.
No new tests, no behavioural change.
* WebCore.pri:
Tools:
Deployment of Qt binaries to different Mac OS X
platform version makes it impossible to link against
the correct version of the WebKitSystemInterface library,
so we need to disable QTKit for media elements.
* qmake/mkspecs/features/features.prf:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@151546 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Change-Id: I8ad054ffc1896de1cc461efed0a5786337c29261
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebCore/WebCore.pri | 36 |
1 files changed, 1 insertions, 35 deletions
diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri index b7cd93adf..cb9452356 100644 --- a/Source/WebCore/WebCore.pri +++ b/Source/WebCore/WebCore.pri @@ -177,41 +177,7 @@ use?(GSTREAMER) { } enable?(VIDEO) { - use?(QTKIT) { - INCLUDEPATH += $$SOURCE_DIR/platform/graphics/mac - - LIBS += -framework AppKit -framework AudioUnit \ - -framework AudioToolbox -framework CoreAudio \ - -framework QuartzCore -framework QTKit \ - -framework Security -framework IOKit - - DARWIN_VERSION = $$split(QMAKE_HOST.version, ".") - DARWIN_MAJOR_VERSION = $$first(DARWIN_VERSION) - - haveQt(5,1) { - equals(QMAKE_MAC_SDK_VERSION, 10.7): \ - SYSTEM_LIBRARY_PATH = $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceLion.a - else:equals(QMAKE_MAC_SDK_VERSION, 10.8): \ - SYSTEM_LIBRARY_PATH = $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a - } else { - # We first check if a specific SDK is set to be used for the build. - contains(QMAKE_MAC_SDK, ".*MacOSX10.7.sdk.*") { - SYSTEM_LIBRARY_PATH = $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceLion.a - } else:contains(QMAKE_MAC_SDK, ".*MacOSX10.8.sdk.*") { - SYSTEM_LIBRARY_PATH = $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a - } - - # If the previous check did not yield a result, we resort to the Darwin version. - isEmpty(SYSTEM_LIBRARY_PATH) { - equals(DARWIN_MAJOR_VERSION, "11") { - SYSTEM_LIBRARY_PATH = $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceLion.a - } else:equals(DARWIN_MAJOR_VERSION, "12") { - SYSTEM_LIBRARY_PATH = $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a - } - } - } - LIBS += $$SYSTEM_LIBRARY_PATH - } else:use?(GSTREAMER) { + use?(GSTREAMER) { INCLUDEPATH += $$SOURCE_DIR/platform/graphics/gstreamer } else:use?(QT_MULTIMEDIA) { QT *= multimedia |