diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2020-03-25 21:52:49 +0100 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2020-03-26 08:56:40 +0000 |
| commit | 9a3c1a3ef004bdd948524afc37050a617a6e4823 (patch) | |
| tree | 72ac7beb2cceda6c7cd38773a1613dbdc010eb8d /src | |
| parent | 4e35093ea7f6be6caf34b0627fbaffab984a5e0f (diff) | |
qdoc: Ensure macros as a macro parameter are expanded
QDoc allows macros to be nested, and macro parameters can also be
other macros, but in one code path the parameter was read verbatim,
i.e. not expanded. This is an unnecessary restriction so remove it.
Fixes: QTBUG-83085
Change-Id: I6dc7c2f7586a65bee78096fb50685262dad2ffe3
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qdoc/doc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qdoc/doc.cpp b/src/qdoc/doc.cpp index 5b52e9e1a..23d5205ff 100644 --- a/src/qdoc/doc.cpp +++ b/src/qdoc/doc.cpp @@ -2086,7 +2086,7 @@ void DocParser::expandMacro(const QString &name, const QString &def, int numPara for (int i = 0; i < numParams; ++i) { if (numParams == 1 || isLeftBraceAhead()) { - args << getArgument(true); + args << getArgument(); } else { location().warning(tr("Macro '\\%1' invoked with too few" " arguments (expected %2, got %3)") |