diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-04-08 12:51:58 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-04-15 10:49:52 +0200 |
commit | 0ac8e8197f2c746db46ff10461c691678353ac23 (patch) | |
tree | dd1466f77dc0c5aa761f57c12188524a3be5accf | |
parent | 0375890c48223f0b7d400b6abaa338c6f44796d1 (diff) |
Update build requirements
Update to requiring macOS 10.13 and Xcode 10.
Change-Id: I50aae730096da76e8917041211e7c143a69941eb
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
-rw-r--r-- | configure.pri | 15 | ||||
-rw-r--r-- | src/webengine/doc/src/qtwebengine-platform-notes.qdoc | 12 |
2 files changed, 13 insertions, 14 deletions
diff --git a/configure.pri b/configure.pri index f2c3620de..37a855177 100644 --- a/configure.pri +++ b/configure.pri @@ -424,23 +424,22 @@ defineTest(qtwebengine_isWindowsPlatformSupported) { } defineTest(qtwebengine_isMacOsPlatformSupported) { - # FIXME: Try to get it back down to 8.2 for building on OS X 10.11 - !qtwebengine_isMinXcodeVersion(8, 3, 3) { - qtwebengine_platformError("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 8.3.3 is required to build Qt WebEngine or Qt Pdf.") + !qtwebengine_isMinXcodeVersion(10, 0, 0) { + qtwebengine_platformError("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 10.0.0 is required to build Qt WebEngine or Qt Pdf.") return(false) } !clang|intel_icc { qtwebengine_platformError("Qt WebEngine and Qt Pdf requires Clang.") return(false) } - # We require macOS 10.12 (darwin version 16.0.0) or newer. + # We require macOS 10.13 (darwin version 17.0.0) or newer. darwin_major_version = $$section(QMAKE_HOST.version, ., 0, 0) - lessThan(darwin_major_version, 16) { - qtwebengine_platformError("Building Qt WebEngine or Qt Pdf requires macOS version 10.12 or newer.") + lessThan(darwin_major_version, 17) { + qtwebengine_platformError("Building Qt WebEngine or Qt Pdf requires macOS version 10.13 or newer.") return(false) } - !qtwebengine_isMinOSXSDKVersion(10, 12): { - qtwebengine_platformError("Building Qt WebEngine or Qt Pdf requires a macOS SDK version of 10.12 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") + !qtwebengine_isMinOSXSDKVersion(10, 13): { + qtwebengine_platformError("Building Qt WebEngine or Qt Pdf requires a macOS SDK version of 10.13 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") return(false) } return(true) diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc index 1af2141b1..982363bb2 100644 --- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc +++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc @@ -87,7 +87,7 @@ \section2 Linux On Linux, Clang or GCC version 5 or later is required. - Supported configurations are \c linux-g++ and \c{linux-clang}. + Supported configurations are \c linux-g++, \c{linux-clang} and \c{linux-clang-libc++} \QWE requires \c pkg-config to detect most of its dependencies. The following \c pkg-config files are required: @@ -117,9 +117,9 @@ On \macos, the following are required: \list - \li \macos 10.12 or later - \li Xcode 8.3.3 or later - \li \macos 10.12 SDK or later + \li \macos 10.13 or later + \li Xcode 10.0 or later + \li \macos 10.13 SDK or later \endlist \note \QWE cannot be built for the 32-bit mode of \macos (using the @@ -128,8 +128,8 @@ \section1 Using Earlier Qt Versions to Build \QWE Building \QWE with earlier Qt versions (down to the last LTS - version) is supported. It means that \QWE 5.11 can be built with - Qt 5.9.x, Qt 5.10.x, and Qt 5.11. + version) is supported. It means that \QWE 5.15 can be built with + Qt 5.12.x, Qt 5.14.x, and Qt 5.15. To use an earlier Qt version to build Qt Webengine: |