summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@qt.io>2018-09-06 11:32:30 +0200
committerMartin Smith <martin.smith@qt.io>2018-09-06 10:33:29 +0000
commit6b20b67ff1781790158b03c5d58f5ddb50b109a3 (patch)
tree031212359e12eb1e5e5893a1aa9ef12ec337dc4e /src
parent2177c9839e51ae2705780d7cc648613ec5cd5d8d (diff)
qdoc: Don't list inherited members on obsolete members page
This update fixes the part of the bug where inherited members were being listed on the obsolete members page. They are no longer listed there. Change-Id: Ibd9cc0af22deda501d5ec7eb09e472840831f256 Task-number: QTBUG-70321 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/qdoc/htmlgenerator.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp
index 271aea3fb..c9f44863f 100644
--- a/src/qdoc/htmlgenerator.cpp
+++ b/src/qdoc/htmlgenerator.cpp
@@ -3312,7 +3312,7 @@ void HtmlGenerator::generateSectionList(const Section& section,
generateInvokableNote(relative, marker);
}
- if (section.style() == Section::Summary && !section.inheritedMembers().isEmpty()) {
+ if (status != Section::Obsolete && section.style() == Section::Summary && !section.inheritedMembers().isEmpty()) {
out() << "<ul>\n";
generateSectionInheritedList(section, relative);
out() << "</ul>\n";