[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>

2 files changed, 11 insertions, 55 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
diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf
index 3a17133a6..ddbccf984 100644
--- a/Tools/qmake/mkspecs/features/features.prf
+++ b/Tools/qmake/mkspecs/features/features.prf
@@ -100,28 +100,18 @@ defineTest(detectFeatures) {
     # Orientation support
     haveQtModule(sensors): WEBKIT_CONFIG += orientation_events device_orientation
 
-    # HTML5 Media Support
-    mac {
-        QMAKE_MAC_SDK_VERSION = $$system("xcodebuild -sdk $$QMAKE_MAC_SDK -version SDKVersion 2>/dev/null")
-        haveQt(5,1):!equals(QMAKE_MACOSX_DEPLOYMENT_TARGET, $$QMAKE_MAC_SDK_VERSION) {
-            CONFIGURE_WARNINGS += "Deployment target ($$QMAKE_MACOSX_DEPLOYMENT_TARGET) doesn't match SDK ($$QMAKE_MAC_SDK_VERSION), disabling media element support"
-        } else {
-            DARWIN_VERSION = $$split(QMAKE_HOST.version, ".")
-            DARWIN_MAJOR_VERSION = $$first(DARWIN_VERSION)
-            # QTKIT support requires 10.7 or newer
-            greaterThan(DARWIN_MAJOR_VERSION, 10) {
-                WEBKIT_CONFIG += video use_qtkit
+    # HTML5 Media Support for non-Mac builds
+    !mac {
+        !contains(QT_CONFIG, no-pkg-config) {
+            packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") {
+                WEBKIT_CONFIG += video use_gstreamer
+            } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") {
+                WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
             }
         }
-    } else: linux-* {
-        !contains(QT_CONFIG, no-pkg-config):packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") {
-            WEBKIT_CONFIG += video use_gstreamer
-        } else:!contains(QT_CONFIG, no-pkg-config):packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") {
-            WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
-        } else {
-            CONFIGURE_WARNINGS += "Missing GLib/Gio/GStreamer, disabling media element support"
-        }
-    } else: haveQtModule(multimediawidgets) {
+    }
+
+    !enable?(video):haveQtModule(multimediawidgets) {
         WEBKIT_CONFIG += video use_qt_multimedia
     }