diff options
| -rw-r--r-- | Tools/ChangeLog | 12 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/features.prf | 16 |
2 files changed, 22 insertions, 6 deletions
diff --git a/Tools/ChangeLog b/Tools/ChangeLog index ee62ee985..818230587 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,15 @@ +2013-04-03 Tor Arne Vestbø <tor.arne.vestbo@digia.com> + + [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-02-19 Simon Hausmann <simon.hausmann@digia.com> [Qt] Skip the build with a warning if certain tools cannot be found in the PATH diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf index 4b2e3e649..61ce4f18a 100644 --- a/Tools/qmake/mkspecs/features/features.prf +++ b/Tools/qmake/mkspecs/features/features.prf @@ -105,13 +105,17 @@ defineTest(detectFeatures) { # 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 |