1 files changed, 22 insertions, 9 deletions
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
index 40532f709..2447d8372 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -1,5 +1,9 @@
 defineTest(isPlatformSupported) {
-  !win32-msvc2013: !contains(QT_CONFIG, c++11) {
+  !linux-g++*:!linux-clang:!win32-msvc2013*:!win32-msvc2015*:!macx-clang*:!boot2qt {
+    skipBuild("Qt WebEngine can currently only be built for Linux (GCC/clang), Windows (MSVC 2013 or 2015), OS X (10.9/XCode 5.1+) or Qt for Device Creation.")
+    return(false)
+  }
+  !contains(QT_CONFIG, c++11) {
     skipBuild("C++11 support is required in order to build chromium.")
     return(false)
   }
@@ -7,18 +11,22 @@ defineTest(isPlatformSupported) {
     skipBuild("Static builds of QtWebEngine aren't supported.")
     return(false)
   }
-  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.")
-    return(false)
+  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.")
+      return(false)
+    }
+    # 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, 13) {
+      skipBuild("OS X version 10.9 or newer is required to build Qt WebEngine.")
+      return(false)
+    }
   }
 
   linux-g++*:!isGCCVersionSupported(): return(false)
   !isPythonVersionSupported(): return(false)
-  linux-g++*|win32-msvc2013|macx-clang*: return(true)
-  boot2qt: return(true)
-
-  skipBuild("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.")
-  return(false)
+  return(true)
 }
 
 defineTest(isPythonVersionSupported) {
@@ -149,6 +157,11 @@ defineReplace(which) {
   return($$out)
 }
 
+defineTest(use?) {
+    contains(WEBENGINE_CONFIG, use_$$lower($$1)): return(true)
+    return(false)
+}
+
 defineReplace(findOrBuildNinja) {
   # If NINJA_PATH env var is set, prefer that.
   # Fallback to locating our own bootstrapped ninja.