From 6e9779ac2c5b0d941bb415fb00e0f193d685457c Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Fri, 12 Aug 2016 15:36:33 +0200
Subject: [PATCH] Lower minimum OS X requirements back to 10.9
This reverts commit c8851dd1a77e730bc6a3c17b7c75b1a4c6b41f53,
and allows building on OS X 10.9 with OS X 10.10 SDK.
Change-Id: Id59b08424165272fd0d35418eef45a03fce731fb
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
---
src/webengine/doc/src/qtwebengine-platform-notes.qdoc | 4 ++--
tools/qmake/mkspecs/features/functions.prf | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
index 9a59f1f1f..119e64279 100644
--- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
+++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
@@ -104,8 +104,8 @@
On OS X, the following are required:
\list
- \li OS X 10.10 or later
- \li Xcode 6.3 or later
+ \li OS X 10.9 or later
+ \li Xcode 5.1 or later
\li OS X 10.10 SDK or later
\endlist
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
index d109e2859..94aa617e7 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -43,14 +43,14 @@ defineTest(isPlatformSupported) {
return(false)
}
} else:osx {
- 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.")
+ 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.")
return(false)
}
- # We require OS X 10.10 (darwin version 14.0.0) or newer
+ # We require OS X 10.9 (darwin version 13.0.0) or newer
darwin_major_version = $$section(QMAKE_HOST.version, ., 0, 0)
- lessThan(darwin_major_version, 14) {
- skipBuild("Qt WebEngine requires OS X version 10.10 or newer.")
+ lessThan(darwin_major_version, 13) {
+ skipBuild("Qt WebEngine requires OS X version 10.9 or newer.")
return(false)
}
!isMinOSXSDKVersion(10, 10): {
--
GitLab