Title: [151546] trunk
- Revision
- 151546
- Author
- michael.brun...@digia.com
- Date
- 2013-06-13 07:42:29 -0700 (Thu, 13 Jun 2013)
Log Message
[Qt][Mac] Disable QTKit video on OS X.
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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (151545 => 151546)
--- trunk/Source/WebCore/ChangeLog 2013-06-13 14:11:02 UTC (rev 151545)
+++ trunk/Source/WebCore/ChangeLog 2013-06-13 14:42:29 UTC (rev 151546)
@@ -1,3 +1,18 @@
+2013-06-13 Michael Brüning <michael.brun...@digia.com>
+
+ [Qt][Mac] Disable QTKit video on OS X.
+ https://bugs.webkit.org/show_bug.cgi?id=117591
+
+ Reviewed by Tor Arne Vestbø.
+
+ 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:
+
2013-06-13 Morten Stenshorne <msten...@opera.com>
Column balancing support in the region based multicol implementation
Modified: trunk/Source/WebCore/WebCore.pri (151545 => 151546)
--- trunk/Source/WebCore/WebCore.pri 2013-06-13 14:11:02 UTC (rev 151545)
+++ trunk/Source/WebCore/WebCore.pri 2013-06-13 14:42:29 UTC (rev 151546)
@@ -180,41 +180,7 @@
}
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
Modified: trunk/Tools/ChangeLog (151545 => 151546)
--- trunk/Tools/ChangeLog 2013-06-13 14:11:02 UTC (rev 151545)
+++ trunk/Tools/ChangeLog 2013-06-13 14:42:29 UTC (rev 151546)
@@ -1,3 +1,17 @@
+2013-06-13 Michael Brüning <michael.brun...@digia.com>
+
+ [Qt][Mac] Disable QTKit video on OS X.
+ https://bugs.webkit.org/show_bug.cgi?id=117591
+
+ Reviewed by Tor Arne Vestbø.
+
+ 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:
+
2013-06-13 Michał Pakuła vel Rutka <m.pak...@samsung.com>
[EFL][WK2] Wrong context menu and popup menu positions when scroll is applied
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (151545 => 151546)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2013-06-13 14:11:02 UTC (rev 151545)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2013-06-13 14:42:29 UTC (rev 151546)
@@ -105,25 +105,15 @@
# and used for layout tests)
have?(qtsensors)|!production_build: 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: !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
- }
}
!enable?(video):haveQtModule(multimediawidgets) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
