dev-qt/qtwebengine/files/qtwebengine-5.14.1-detect-ninja-1.10.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27

From 8c1a4841174a90299ba2e2851b4d9e79da3b9b25 Mon Sep 17 00:00:00 2001
From: Kirill Burtsev <kirill.burtsev@qt.io>
Date: Fri, 6 Mar 2020 17:38:45 +0100
Subject: [PATCH] Support build with system ninja >= 1.10.0

Fixes: QTBUG-82715
Change-Id: I9a269efa20d092f75a8a43cb20d1e0dc0f46b9f9
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
 configure.pri | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.pri b/configure.pri
index 3a144e3f8e..3cfce71e03 100644
--- a/configure.pri
+++ b/configure.pri
@@ -163,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")
-- 
2.16.3