From 13caeb013d38d56736b021f177403c71d9909041 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Wed, 12 Aug 2020 14:11:49 +0200 Subject: 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 (cherry picked from commit 6ef42beb152dd74e74d8aaeaf644581fbd88dfb0) Reviewed-by: Qt Cherry-pick Bot --- src/qdoc/parameters.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) 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); } } -- cgit v1.2.3