1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Doc: Fix filenames for nested classes generated by qdoc

Browse Source 
Generator::fullDocumentLocation() adds a parent class name twice into
the generated filename for nested classes, which not correct.

This change fixes the issue and makes documentation for nested classes
work in Qt Creator (qch files).

Task-number: QTBUG-29440
Change-Id: I489800ba09f49dda2befef73634cb2b344be0060
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
This commit is contained in:
Topi Reinio 2013-02-01 11:45:38 +01:00 committed by The Qt Project
parent 334101df92
commit 1d9863658d
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tools/qdoc/generator.cpp
View File

@ -476,13 +476,7 @@ QString Generator::fullDocumentLocation(const Node *node, bool subdir)
switch (node->type()) {
case Node::Class:
case Node::Namespace:
if (parentNode && !parentNode->name().isEmpty()) {
parentName.remove(QLatin1Char('.') + currentGenerator()->fileExtension());
parentName += QLatin1Char('-')
+ fileBase(node).toLower() + QLatin1Char('.') + currentGenerator()->fileExtension();
} else {
parentName = fileBase(node) + QLatin1Char('.') + currentGenerator()->fileExtension();
}
parentName = fileBase(node) + QLatin1Char('.') + currentGenerator()->fileExtension();
break;
case Node::Function:
{