Commit df24e63b authored by Michal Klocek's avatar Michal Klocek
Browse files

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: default avatarAllan Sandfeld Jensen <allan.jensen@qt.io>
Showing with 8 additions and 4 deletions
......@@ -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)
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment