1 files changed, 11 insertions, 12 deletions

diff --git a/configure.pri b/configure.pri
index 4728ec329..3cfce71e0 100644
--- a/configure.pri
+++ b/configure.pri
@@ -26,7 +26,10 @@ defineTest(isPythonVersionSupported) {
 defineTest(qtConfTest_detectJumboBuild) {
     mergeLimit = $$eval(config.input.merge_limit)
     mergeLimit = $$find(mergeLimit, "\\d")
-    isEmpty(mergeLimit): mergeLimit = 0
+    isEmpty(mergeLimit) {
+       win32: mergeLimit = 0
+       else: mergeLimit = 8
+    }
     qtLog("Setting jumbo build merge batch limit to $${mergeLimit}.")
     $${1}.merge_limit = $$mergeLimit
     export($${1}.merge_limit)
@@ -42,9 +45,10 @@ defineTest(qtConfReport_skipBuildWarning) {
 }
 
 defineTest(qtConfReport_jumboBuild) {
-    mergeLimit = $$eval(config.input.merge_limit)
-    mergeLimit = $$find(mergeLimit, "\d")
-    isEmpty(mergeLimit): mergeLimit = "no"
+    mergeLimit = $$eval(cache.webengine-jumbo-build.merge_limit)
+    isEmpty(mergeLimit)|!greaterThan(mergeLimit,0) {
+       mergeLimit = "no"
+    }
     qtConfReportPadded($${1}, $$mergeLimit)
 }
 
@@ -159,7 +163,7 @@ defineTest(qtConfTest_detectNinja) {
     !isEmpty(ninja) {
         qtLog("Found ninja from path: $$ninja")
         qtRunLoggedCommand("$$ninja --version", version)|return(false)
-        contains(version, "1.[7-9].*"): return(true)
+        contains(version, "1\.([7-9]|1[0-9])\..*"): return(true)
         qtLog("Ninja version too old")
     }
     qtLog("Building own ninja")
@@ -363,11 +367,6 @@ defineTest(qtConfTest_hasThumbFlag) {
     return(true)
 }
 
-defineTest(qtConfTest_hasGcc6OrNewer) {
-    greaterThan(QMAKE_GCC_MAJOR_VERSION, 5):return(true)
-    return(false)
-}
-
 defineTest(qtConfTest_detectSubmodule) {
     isEmpty(QTWEBENGINE_ROOT) {
         # topLevel build , add poor man's workaround
@@ -414,8 +413,8 @@ defineTest(qtwebengine_isWindowsPlatformSupported) {
         qtwebengine_platformError("Qt WebEngine on Windows requires MSVC or Clang (MSVC mode).")
         return(false)
     }
-    !qtwebengine_isMinWinSDKVersion(10, 17763): {
-        qtwebengine_platformError("Qt WebEngine on Windows requires a Windows SDK version 10.0.17763 or newer.")
+    !qtwebengine_isMinWinSDKVersion(10, 18362): {
+        qtwebengine_platformError("Qt WebEngine on Windows requires a Windows SDK version 10.0.18362 or newer.")
         return(false)
     }
     return(true)