Title: [147540] trunk/Tools
- Revision
- 147540
- Author
- [email protected]
- Date
- 2013-04-03 04:56:24 -0700 (Wed, 03 Apr 2013)
Log Message
[Qt] Disable media support using QuickTime if deployment target != SDK
We link to a single libWebKitSystemInterface static lib, so unless the
deployment target matches the SDK let's not pretend like we'll be able
to run on anything lower than the SDK version.
Reviewed by Simon Hausmann.
* qmake/mkspecs/features/features.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (147539 => 147540)
--- trunk/Tools/ChangeLog 2013-04-03 11:15:23 UTC (rev 147539)
+++ trunk/Tools/ChangeLog 2013-04-03 11:56:24 UTC (rev 147540)
@@ -1,3 +1,15 @@
+2013-04-03 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Disable media support using QuickTime if deployment target != SDK
+
+ We link to a single libWebKitSystemInterface static lib, so unless the
+ deployment target matches the SDK let's not pretend like we'll be able
+ to run on anything lower than the SDK version.
+
+ Reviewed by Simon Hausmann.
+
+ * qmake/mkspecs/features/features.prf:
+
2013-04-02 James Craig <[email protected]>
AXRoleDescripton for DL is "list"; should be "description list"
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (147539 => 147540)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2013-04-03 11:15:23 UTC (rev 147539)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2013-04-03 11:56:24 UTC (rev 147540)
@@ -109,13 +109,17 @@
# HTML5 Media Support
mac {
- 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
+ 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
+ }
}
-
} 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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
