diff options
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/qdoc/cppcodemarker.cpp | 6 | ||||
| -rw-r--r-- | src/tools/qdoc/cppcodeparser.cpp | 2 |
2 files changed, 7 insertions, 1 deletions
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<Section> 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<const VariableNode *>(*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(); } /*! |