diff options
author | Martin Smith <martin.smith@qt.io> | 2019-06-26 13:36:57 +0200 |
---|---|---|
committer | Martin Smith <martin.smith@qt.io> | 2019-07-01 12:44:10 +0200 |
commit | 00f6687bce9fdd8d8d423ad7b78aa9cf5bb12c9a (patch) | |
tree | 72241b493197116dc617d7608225fbf8ed7f53e1 | |
parent | 4617216e6f5952c34e93f3d803034276b5dfdc8e (diff) | |
download | qttools-00f6687bce9fdd8d8d423ad7b78aa9cf5bb12c9a.tar.gz |
qdoc: Sort qualified names correctly in generateCompactList()
qdoc was not sorting qualified class names correctly for inclusion in the
All Classes list. For example, QAttribute (Qt3DRender) was being placed in
the list in the position for Qt3DRender::QAttribute instead of the position
for QAttribute (Qt3DRender). This update corrects that bug.
Task-number: QTBUG-76506
Change-Id: Ie837ab45e20569b4afd578341dbce9ee6fd9c08b
Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
-rw-r--r-- | src/qdoc/htmlgenerator.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp index f22a9d130..a359aefb1 100644 --- a/src/qdoc/htmlgenerator.cpp +++ b/src/qdoc/htmlgenerator.cpp @@ -3050,11 +3050,11 @@ void HtmlGenerator::generateCompactList(ListType listType, NodeMultiMap::ConstIterator c = nmm.constBegin(); while (c != nmm.constEnd()) { QStringList pieces = c.key().split("::"); - QString key; int idx = commonPrefixLen; if (idx > 0 && !pieces.last().startsWith(commonPrefix, Qt::CaseInsensitive)) idx = 0; - key = pieces.last().mid(idx).toLower(); + QString last = pieces.last().toLower(); + QString key = last.mid(idx); int paragraphNr = NumParagraphs - 1; @@ -3067,7 +3067,7 @@ void HtmlGenerator::generateCompactList(ListType listType, paragraphName[paragraphNr] = key[0].toUpper(); usedParagraphNames.insert(key[0].toLower().cell()); - paragraph[paragraphNr].insert(c.key(), c.value()); + paragraph[paragraphNr].insert(last, c.value()); ++c; } |