diff options
| author | Kirill Burtsev <kirill.burtsev@qt.io> | 2020-03-06 17:38:45 +0100 |
|---|---|---|
| committer | Kirill Burtsev <kirill.burtsev@qt.io> | 2020-03-11 01:08:38 +0100 |
| commit | 8c1a4841174a90299ba2e2851b4d9e79da3b9b25 (patch) | |
| tree | 64bda8b9e00992ae0a454f63be0bc4e221a5ea2a /configure.pri | |
| parent | 2f88f91de1fd97bb45f71b3ab9b3ad2b4a3ba8aa (diff) | |
Support build with system ninja >= 1.10.0
Fixes: QTBUG-82715
Change-Id: I9a269efa20d092f75a8a43cb20d1e0dc0f46b9f9
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
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 3a144e3f8..3cfce71e0 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") |