diff options
| author | Martin Smith <martin.smith@digia.com> | 2014-07-30 13:44:15 +0200 |
|---|---|---|
| committer | Martin Smith <martin.smith@digia.com> | 2014-08-22 18:23:39 +0200 |
| commit | a5570bbf9af05fa33cfcc9f167786e8d2ca1e32e (patch) | |
| tree | 40749767c38c88e6a52f66572664df5df61ab908 /src/tools/qdoc/qdocindexfiles.cpp | |
| parent | 701b72c261922a2f96e3433f1f82646b1b339ff0 (diff) | |
qdoc: Remove all collision node stuff from qdoc
Now that the qdoc link command has ability to tell qdoc which module
contains a link target or whether to link to a QML or CPP entity,
collision pages should no longer be necessary. In fact, qdoc hasn't
been generating any collisions for some time. This task removes all
the collision node code from qdoc.
Task-number: QTBUG-40506
Change-Id: I34d1980ca1c0fe4bb5ad27dd4b00e61fa7e6e335
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Diffstat (limited to 'src/tools/qdoc/qdocindexfiles.cpp')
| -rw-r--r-- | src/tools/qdoc/qdocindexfiles.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/tools/qdoc/qdocindexfiles.cpp b/src/tools/qdoc/qdocindexfiles.cpp index ba09bfea3b5..33f848b306f 100644 --- a/src/tools/qdoc/qdocindexfiles.cpp +++ b/src/tools/qdoc/qdocindexfiles.cpp @@ -1337,20 +1337,7 @@ void QDocIndexFiles::generateIndexSections(QXmlStreamWriter& writer, std::sort(cnodes.begin(), cnodes.end(), compareNodes); foreach (Node* child, cnodes) { - /* - Don't generate anything for a collision node. We want - children of collision nodes in the index, but leaving - out the parent collision page will make searching for - nodes easier. - */ - if (child->subType() == Node::Collision) { - const InnerNode* pgn = static_cast<const InnerNode*>(child); - foreach (Node* c, pgn->childNodes()) { - generateIndexSections(writer, c, generateInternalNodes); - } - } - else - generateIndexSections(writer, child, generateInternalNodes); + generateIndexSections(writer, child, generateInternalNodes); } } |