Merge remote-tracking branch 'origin/5.15' into dev

Conflicts:
	configure.pri
	src/pdf/api/qpdfpagerenderer.h

Change-Id: I7e68277080e29238bbfe8511539ea75b2db89489

1 files changed, 8 insertions, 9 deletions

diff --git a/configure.pri b/configure.pri
index 46ce376ef..9a5b8af4a 100644
--- a/configure.pri
+++ b/configure.pri
@@ -166,7 +166,7 @@ defineTest(qtConfTest_detectNinja) {
     !isEmpty(ninja) {
         qtLog("Found ninja from path: $$ninja")
         qtRunLoggedCommand("$$ninja --version", version)|return(false)
-        contains(version, "1.[7-9].*") {
+        contains(version, "1\.([7-9]|1[0-9])\..*") {
             $${1}.path = $$ninja
             export($${1}.path)
             $${1}.cache += path
@@ -430,23 +430,22 @@ defineTest(qtwebengine_isWindowsPlatformSupported) {
 }
 
 defineTest(qtwebengine_isMacOsPlatformSupported) {
-    # FIXME: Try to get it back down to 8.2 for building on OS X 10.11
-    !qtwebengine_isMinXcodeVersion(8, 3, 3) {
-        qtwebengine_platformError("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 8.3.3 is required to build Qt WebEngine or Qt Pdf.")
+    !qtwebengine_isMinXcodeVersion(10, 0, 0) {
+        qtwebengine_platformError("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 10.0.0 is required to build Qt WebEngine or Qt Pdf.")
         return(false)
     }
     !clang|intel_icc {
         qtwebengine_platformError("Qt WebEngine and Qt Pdf requires Clang.")
         return(false)
     }
-    # We require macOS 10.12 (darwin version 16.0.0) or newer.
+    # We require macOS 10.13 (darwin version 17.0.0) or newer.
     darwin_major_version = $$section(QMAKE_HOST.version, ., 0, 0)
-    lessThan(darwin_major_version, 16) {
-        qtwebengine_platformError("Building Qt WebEngine or Qt Pdf requires macOS version 10.12 or newer.")
+    lessThan(darwin_major_version, 17) {
+        qtwebengine_platformError("Building Qt WebEngine or Qt Pdf requires macOS version 10.13 or newer.")
         return(false)
     }
-    !qtwebengine_isMinOSXSDKVersion(10, 12): {
-        qtwebengine_platformError("Building Qt WebEngine or Qt Pdf requires a macOS SDK version of 10.12 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.")
+    !qtwebengine_isMinOSXSDKVersion(10, 13): {
+        qtwebengine_platformError("Building Qt WebEngine or Qt Pdf requires a macOS SDK version of 10.13 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.")
         return(false)
     }
     return(true)