summaryrefslogtreecommitdiffstats
path: root/src/tools/qdoc/ditaxmlgenerator.cpp
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@digia.com>2012-11-29 15:12:56 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-29 20:20:01 +0100
commitd2d210044fe74a6ca8b961fde9389584d8224f3a (patch)
tree22e1c05c07a3f8443589800e0155eb14ce416f8f /src/tools/qdoc/ditaxmlgenerator.cpp
parent14cb07864e820f9a4b9a3c76aba299bd0ed34fc4 (diff)
qdoc: Don't include internal items in annotated lists
Now things that are marked internal oe whose parent is marked internal won't appear in annotated lists. Task-number: QTBUG-28274 Change-Id: I14ea96e223640cad45e7e4249a3e1fc0642bd9c3 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/tools/qdoc/ditaxmlgenerator.cpp')
-rw-r--r--src/tools/qdoc/ditaxmlgenerator.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/tools/qdoc/ditaxmlgenerator.cpp b/src/tools/qdoc/ditaxmlgenerator.cpp
index b5d52bb7fa..f912c3b909 100644
--- a/src/tools/qdoc/ditaxmlgenerator.cpp
+++ b/src/tools/qdoc/ditaxmlgenerator.cpp
@@ -2720,6 +2720,15 @@ void DitaXmlGenerator::generateAnnotatedList(const Node* relative,
{
if (nodes.isEmpty())
return;
+ bool allInternal = true;
+ foreach (const Node* node, nodes) {
+ if (!node->isInternal() && node->status() != Node::Obsolete) {
+ allInternal = false;
+ }
+ }
+ if (allInternal)
+ return;
+
writeStartTag(DT_table);
xmlWriter().writeAttribute("outputclass","annotated");
writeStartTag(DT_tgroup);
@@ -2727,7 +2736,7 @@ void DitaXmlGenerator::generateAnnotatedList(const Node* relative,
writeStartTag(DT_tbody);
foreach (const Node* node, nodes) {
- if (node->status() == Node::Obsolete)
+ if (node->isInternal() || node->status() == Node::Obsolete)
continue;
writeStartTag(DT_row);