diff options
| author | Paul Wicking <paul.wicking@qt.io> | 2020-01-21 07:46:21 +0100 |
|---|---|---|
| committer | Paul Wicking <paul.wicking@qt.io> | 2020-01-21 09:19:00 +0100 |
| commit | 447f33743c3e07d645831f07b821ad76a203fd6f (patch) | |
| tree | f6cddb6ff361e9c26b66e11f6e558fd3393c487e | |
| parent | e3507ac277fcb8da41ae21138b6c0f233d17ee38 (diff) | |
| download | qttools-447f33743c3e07d645831f07b821ad76a203fd6f.tar.gz | |
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 <simon.hausmann@qt.io>
| -rw-r--r-- | src/qdoc/configure.pri | 8 |
1 files 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) |