From 9e65aaf4e0d0c5b5d927f2fbc5c8aa052bae24b8 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 1 Jul 2016 14:14:41 +0200 Subject: Fix building on OS X 10.9 with 10.10 SDK Previously building on OS X 10.9 was only allowed with a 10.10.3 SDK. But there is no supported version of Xcode on 10.9 that would ship with that SDK, which lead to the fact that there was no way to compile WebEngine with an officialy provided toolchain. This patch lowers the requirement of the SDK to 10.10, at the expense of disabling usage of API that was added in the 10.10.3 SDK release (Force Touch API). The required minimum Xcode version is thus bumped to 6.1, and the documentation is updated accordingly. Task-number: QTBUG-54486 Change-Id: I025caa336ceac5b8ea76ef451eb5e6b78abfe0c9 Reviewed-by: Allan Sandfeld Jensen --- src/3rdparty | 2 +- src/core/config/mac_osx.pri | 5 +++++ src/webengine/doc/src/qtwebengine-platform-notes.qdoc | 8 +++++++- 3 files changed, 13 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/3rdparty b/src/3rdparty index 77c17ae35..c109a95a0 160000 --- a/src/3rdparty +++ b/src/3rdparty @@ -1 +1 @@ -Subproject commit 77c17ae35f825cb70e46b880fb0b5ed7be83709c +Subproject commit c109a95a067af783e48f93d1cdeca870cda98878 diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri index 83ddea233..c447add4a 100644 --- a/src/core/config/mac_osx.pri +++ b/src/core/config/mac_osx.pri @@ -1,4 +1,5 @@ include(common.pri) +load(functions) # Reuse the cached sdk version value from mac/sdk.prf if available # otherwise query for it. @@ -26,5 +27,9 @@ GYP_CONFIG += \ clang_use_chrome_plugins=0 \ enable_widevine=1 +# Force touch API is used in 49-based Chromium, which is included starting with 10.10.3 SDK, so we +# disable the API usage if the SDK version is lower. +!isMinOSXSDKVersion(10, 10, 3): GYP_CONFIG += disable_force_touch=1 + QMAKE_MAC_SDK_PATH = "$$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.path)" exists($$QMAKE_MAC_SDK_PATH): GYP_CONFIG += mac_sdk_path=\"$${QMAKE_MAC_SDK_PATH}\" diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc index ecec53bda..989c69d6c 100644 --- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc +++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc @@ -114,7 +114,13 @@ \section2 OS X - On OS X, Xcode version 5.1 or later on OS X 10.9 or later is required. + On OS X, the following is required: + + \list + \li OS X 10.9 or later + \li Xcode 6.1 or later + \li OS X 10.10 SDK or later + \endlist \note Qt WebEngine cannot be built for the 32-bit mode of OS X (using the \c macx-clang-32 \c mkspec). -- cgit v1.2.3