Commit 41ba9b70 authored by Jani Heikkinen's avatar Jani Heikkinen Committed by Liang Qi
Browse files

Revert "Lower minimum OS X requirements back to 10.9"

This reverts commit 6e9779ac

.

It seems there is an issue with 10.9 & Qt 5.8, see QTBUG-56563. 
Reverting this to be able to integrate qt5.git in '5.8'

Change-Id: Ide35be544e81d31c3bcbd525bb43d3a864ce116c
Reviewed-by: default avatarFrederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: default avatarAlexandru Croitor <alexandru.croitor@qt.io>
Showing with 7 additions and 7 deletions
......@@ -104,8 +104,8 @@
On OS X, the following are required:
\list
\li OS X 10.9 or later
\li Xcode 5.1 or later
\li OS X 10.10 or later
\li Xcode 6.3 or later
\li OS X 10.10 SDK or later
\endlist
......
......@@ -43,14 +43,14 @@ defineTest(isPlatformSupported) {
return(false)
}
} else:osx {
lessThan(QMAKE_XCODE_VERSION, 5.1) {
skipBuild("Using XCode version $$QMAKE_XCODE_VERSION, but at least version 5.1 is required to build Qt WebEngine.")
lessThan(QMAKE_XCODE_VERSION, 6.3) {
skipBuild("Using XCode version $$QMAKE_XCODE_VERSION, but at least version 6.3 is required to build Qt WebEngine.")
return(false)
}
# We require OS X 10.9 (darwin version 13.0.0) or newer
# We require OS X 10.10 (darwin version 14.0.0) or newer
darwin_major_version = $$section(QMAKE_HOST.version, ., 0, 0)
lessThan(darwin_major_version, 13) {
skipBuild("Qt WebEngine requires OS X version 10.9 or newer.")
lessThan(darwin_major_version, 14) {
skipBuild("Qt WebEngine requires OS X version 10.10 or newer.")
return(false)
}
!isMinOSXSDKVersion(10, 10): {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment