diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2020-08-12 14:11:49 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-08-12 18:55:36 +0000 |
| commit | 13caeb013d38d56736b021f177403c71d9909041 (patch) | |
| tree | cfd83a4f25d95f1e71ca87b5cffacb8f9325eab2 | |
| parent | 535bca39d5893bcfd1dc7fc28b3cd6af425d37d5 (diff) | |
qdoc: Fix regression in processing macro parameters
A previous commit removed a crucial part of the code
for resolving the type and name of a parameter.
This commit partially reverts be0ba30d995ac7504d3ec69145ea425d1e68e7df.
Fixes: QTBUG-86010
Change-Id: Ib34320e767e12bb42477cd406e51faf7bcfbf62c
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit 6ef42beb152dd74e74d8aaeaf644581fbd88dfb0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/qdoc/parameters.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/qdoc/parameters.cpp b/src/qdoc/parameters.cpp index 3d5effeef..08ca7af41 100644 --- a/src/qdoc/parameters.cpp +++ b/src/qdoc/parameters.cpp @@ -481,6 +481,15 @@ void Parameters::set(const QString &signature) QString pType = blankSplit.join(' '); if (pType.isEmpty() && pName == QLatin1String("...")) qSwap(pType, pName); + else { + int j = 0; + while (j < pName.length() && !pName.at(j).isLetter()) + j++; + if (j > 0) { + pType += QChar(' ') + pName.left(j); + pName = pName.mid(j); + } + } parameters_[i++].set(pType, pName, pDefault); } } |