From 01f2c1ca468dc2fc9c08d6a4ed1ff7465e2f40a7 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Tue, 18 Oct 2016 12:26:01 +0200
Subject: [PATCH] Revert "Revert "Lower minimum OS X requirements back to
10.9""
fdf3a40 in qtwebview fixed the macOS 10.9 build issue.
This reverts commit 41ba9b70525139fb52d00ba81eb8a53293ad71db.
Change-Id: I178ba785500bf7d15f1b0b8319fe520d07f0388c
Reviewed-by: Alexandru Croitor <alexandru.croitor@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