diff options
Diffstat (limited to 'src')
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/core/config/mac_osx.pri | 5 | ||||
| -rw-r--r-- | src/webengine/doc/src/qtwebengine-platform-notes.qdoc | 8 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/3rdparty b/src/3rdparty -Subproject 77c17ae35f825cb70e46b880fb0b5ed7be83709 +Subproject c109a95a067af783e48f93d1cdeca870cda9887 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). |