diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2016-10-17 04:30:45 +0000 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-17 08:39:47 +0000 |
| commit | 41ba9b70525139fb52d00ba81eb8a53293ad71db (patch) | |
| tree | 835b7fe14c83ffbe3f48741dfce3167f3afc628a | |
| parent | edf90a9e865592ba09d495c6264b31e72a4d2d52 (diff) | |
Revert "Lower minimum OS X requirements back to 10.9"
This reverts commit 6e9779ac2c5b0d941bb415fb00e0f193d685457c.
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: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | src/webengine/doc/src/qtwebengine-platform-notes.qdoc | 4 | ||||
| -rw-r--r-- | 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 119e64279..9a59f1f1f 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.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 diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index 94aa617e7..d109e2859 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, 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): { |