diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2020-04-27 23:35:28 +0200 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2020-05-01 14:16:35 +0000 |
| commit | e5454810151752ca3230395909fb3cc57b21c071 (patch) | |
| tree | fe18ba748e3c8ec7454f01d84fc54791cd419dcd /tests/auto/qdoc/generatedoutput/testdata | |
| parent | b264dc2456c3f9b936a235853d79d9743aa1b3a2 (diff) | |
qdoc: Allow expansion of config variables
In addition to expanding environment variables within the values of
configuration variables, allow also the expansion from other config
variables. This gives us more flexibility in designing documentation
templates that can be customized per module.
The environment variables take priority - if expansion fails, do not
bail out immediately but mark the location for expansion once all
variables are read in.
For referencing variables, add support for a new syntax with enclosing
braces, with an optional parameter for controlling how multi-line
values are joined in the expanded string.
[ChangeLog][qdoc] Allow expansion from other configuration variables
in .qdocconf files.
Fixes: QTBUG-83826
Change-Id: Ifccd0c8844d65991df99cb8a2eb1d1bf2f3b4484
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Diffstat (limited to 'tests/auto/qdoc/generatedoutput/testdata')
| -rw-r--r-- | tests/auto/qdoc/generatedoutput/testdata/configs/test.qdocconf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/test.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/test.qdocconf index e4cef822e..f1ab7ec2e 100644 --- a/tests/auto/qdoc/generatedoutput/testdata/configs/test.qdocconf +++ b/tests/auto/qdoc/generatedoutput/testdata/configs/test.qdocconf @@ -1,5 +1,6 @@ project = OutputFromQDocFiles description = "A test project for QDoc build artifacts" +buildversion = "$project - $description" moduleheader = sources = ../outputfromqdocfiles/qdoctests-outputfromqdocfiles.qdoc |