From 447f33743c3e07d645831f07b821ad76a203fd6f Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Tue, 21 Jan 2020 07:46:21 +0100 Subject: QDoc: Let configure accept libclang built from git sources Add "git" as allowed optional version string suffix. Fixes: QTBUG-81534 Change-Id: Ia83d924f4e16045b464e94954b544d3d2c111523 Reviewed-by: Simon Hausmann --- src/qdoc/configure.pri | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qdoc/configure.pri b/src/qdoc/configure.pri index e9d7667c0..670ad5e7b 100644 --- a/src/qdoc/configure.pri +++ b/src/qdoc/configure.pri @@ -1,7 +1,7 @@ -defineReplace(extractVersion) { return($$replace(1, ^(\\d+\\.\\d+\\.\\d+)(svn)?$, \\1)) } -defineReplace(extractMajorVersion) { return($$replace(1, ^(\\d+)\\.\\d+\\.\\d+(svn)?$, \\1)) } -defineReplace(extractMinorVersion) { return($$replace(1, ^\\d+\\.(\\d+)\\.\\d+(svn)?$, \\1)) } -defineReplace(extractPatchVersion) { return($$replace(1, ^\\d+\\.\\d+\\.(\\d+)(svn)?$, \\1)) } +defineReplace(extractVersion) { return($$replace(1, ^(\\d+\\.\\d+\\.\\d+)(svn|git)?$, \\1)) } +defineReplace(extractMajorVersion) { return($$replace(1, ^(\\d+)\\.\\d+\\.\\d+(svn|git)?$, \\1)) } +defineReplace(extractMinorVersion) { return($$replace(1, ^\\d+\\.(\\d+)\\.\\d+(svn|git)?$, \\1)) } +defineReplace(extractPatchVersion) { return($$replace(1, ^\\d+\\.\\d+\\.(\\d+)(svn|git)?$, \\1)) } defineTest(versionIsAtLeast) { actual_major_version = $$extractMajorVersion($$1) -- cgit v1.2.3