From e0b39658318502dc30dcd40c5e2cadadce7d997c Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Thu, 2 Aug 2012 13:25:55 +0200 Subject: qdoc: Ignore property functions of obsolete properties Property setter and getter functions are no longer included in the output when the property itself has been marked \obsolete. Task nr: QTBUG-26425 Change-Id: Iac315445d1916467b12be03989bd4513a03a2397 Reviewed-by: Casper van Donderen --- src/tools/qdoc/cppcodemarker.cpp | 6 ++++++ src/tools/qdoc/cppcodeparser.cpp | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src/tools/qdoc') diff --git a/src/tools/qdoc/cppcodemarker.cpp b/src/tools/qdoc/cppcodemarker.cpp index 61f8070654..166ede994a 100644 --- a/src/tools/qdoc/cppcodemarker.cpp +++ b/src/tools/qdoc/cppcodemarker.cpp @@ -578,6 +578,12 @@ QList
CppCodeMarker::sections(const InnerNode *inner, isSlot = (func->metaness() == FunctionNode::Slot); isSignal = (func->metaness() == FunctionNode::Signal); isStatic = func->isStatic(); + if (func->associatedProperty()) { + if (func->associatedProperty()->status() == Node::Obsolete) { + ++c; + continue; + } + } } else if ((*c)->type() == Node::Variable) { const VariableNode *var = static_cast(*c); diff --git a/src/tools/qdoc/cppcodeparser.cpp b/src/tools/qdoc/cppcodeparser.cpp index c95e03f5f7..c072243b4d 100644 --- a/src/tools/qdoc/cppcodeparser.cpp +++ b/src/tools/qdoc/cppcodeparser.cpp @@ -330,11 +330,11 @@ void CppCodeParser::doneParsingHeaderFiles(Tree *tree) */ void CppCodeParser::doneParsingSourceFiles(Tree *tree) { - tree->root()->makeUndocumentedChildrenInternal(); tree->root()->clearCurrentChildPointers(); tree->root()->normalizeOverloads(); tree->fixInheritance(); tree->resolveProperties(); + tree->root()->makeUndocumentedChildrenInternal(); } /*! -- cgit v1.2.3