diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-26 22:17:18 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-31 08:25:54 +0100 |
| commit | 3394cde4e89463ba49af379b89863c7731c4b4ac (patch) | |
| tree | 6f287bc24365ce14e44479ce63793a4e0f92a49c /configure.pri | |
| parent | 4dfe65f6d4d27bde9d4dae51d262493bea70e619 (diff) | |
| parent | 3ec12c0b43f885f85427743c03fe099ffed56fc0 (diff) | |
Merge "Merge branch '5.14' into 5.15"v5.15.0-beta3
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.pri b/configure.pri index f89df5273..f2c3620de 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].*"): return(true) + contains(version, "1\.([7-9]|1[0-9])\..*"): return(true) qtLog("Ninja version too old") } qtLog("Building own ninja") |