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-26 22:17:18 +0100 |
| commit | 3ec12c0b43f885f85427743c03fe099ffed56fc0 (patch) | |
| tree | 0cb3f75b99836b479d99a8ccc8fd8dcc369b8dea /configure.pri | |
| parent | 1d5c00fde1d2263dd74f2bdc8590783057ec853e (diff) | |
| parent | 8947dc6902bfd2a8acd31b8c894407bf6a12695b (diff) | |
Merge branch '5.14' into 5.15
Conflicts:
src/3rdparty
tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
Change-Id: Idbc9d3b06c0052a721c974fbcbfa3164faaead14
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") |