diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2018-07-06 15:58:08 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2018-07-11 09:20:30 +0000 |
| commit | 279069f94779c80bf1ef8835b37968babb930bf0 (patch) | |
| tree | 25364ffa4c6659e3ef1b68ec2b80abbe1d65e186 | |
| parent | 490fdc9bc547b8c10f7e0daf5c898b4548d7309d (diff) | |
Lower Xcode version requirement to 8.3.3 from 9.0
Also adjust the docs and configure checks with the
true required version of the OS, compiler and SDK.
[ChangeLog][General] Updated macOS build requirements to macOS 10.12,
macOS SDK 10.12, Xcode 8.3.3.
Change-Id: I12a8e8abeca7853f4d4e046c90e271a8e5989131
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | mkspecs/features/platform.prf | 14 | ||||
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/webengine/doc/src/qtwebengine-platform-notes.qdoc | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf index 41dbecd10..bf235a9aa 100644 --- a/mkspecs/features/platform.prf +++ b/mkspecs/features/platform.prf @@ -39,22 +39,22 @@ defineTest(isPlatformSupported) { } } else:osx { # FIXME: Try to get it back down to 8.2 for building on OS X 10.11 - lessThan(QMAKE_XCODE_VERSION, 9.0) { - skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 9.0 is required to build Qt WebEngine.") + lessThan(QMAKE_XCODE_VERSION, 8.3.3) { + skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 8.3.3 is required to build Qt WebEngine.") return(false) } !clang|intel_icc { skipBuild("Qt WebEngine on macOS requires Clang.") return(false) } - # We require macOS 10.11 (darwin version 15.0.0) or newer. + # We require macOS 10.12 (darwin version 16.0.0) or newer. darwin_major_version = $$section(QMAKE_HOST.version, ., 0, 0) - lessThan(darwin_major_version, 15) { - skipBuild("Building Qt WebEngine requires macOS version 10.11 or newer.") + lessThan(darwin_major_version, 16) { + skipBuild("Building Qt WebEngine requires macOS version 10.12 or newer.") return(false) } - !isMinOSXSDKVersion(10, 10): { - skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.11 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") + !isMinOSXSDKVersion(10, 12): { + skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.12 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") return(false) } } else { diff --git a/src/3rdparty b/src/3rdparty -Subproject 4ee7f364b5ccdcd98e6ff34e7a82ef937c07c91 +Subproject c67d3d4a83a3be8f98a8ddf098e58191da0a216 diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc index 5d7c70560..403cdf330 100644 --- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc +++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc @@ -104,9 +104,9 @@ On \macos, the following are required: \list - \li \macos 10.9 or later - \li Xcode 5.1 or later - \li \macos 10.10 SDK or later + \li \macos 10.12 or later + \li Xcode 8.3.3 or later + \li \macos 10.12 SDK or later \endlist \note Qt WebEngine cannot be built for the 32-bit mode of \macos (using the |