From df24e63b6e5f6775ac4738cc0ea12ec0cd41a620 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Thu, 26 Sep 2019 15:32:49 +0200
Subject: Set default jumbo build merge limit to 8

If not specified otherwise use 8 as merge limit.
Reuse cached value for report call.

Change-Id: I78b3832b45c787f2ab0dcc9b41b6bb9e76c9c08c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 configure.pri | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/configure.pri b/configure.pri
index 4728ec329..e5ed3b1f5 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)
 }
 
-- 
cgit v1.2.3