AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qdoc: Ignore property functions of obsolete properties

Browse Source 
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 <casper.vandonderen@nokia.com>
This commit is contained in:
Martin Smith 2012-08-02 13:25:55 +02:00 committed by Qt by Nokia
parent f11934af3d
commit e0b3965831
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/qdoc/cppcodemarker.cpp
View File

@ -578,6 +578,12 @@ QList<Section> CppCodeMarker::sections(const InnerNode *inner,
isSlot = (func->metaness() == FunctionNode::Slot); isSlot = (func->metaness() == FunctionNode::Slot);
isSignal = (func->metaness() == FunctionNode::Signal); isSignal = (func->metaness() == FunctionNode::Signal);
isStatic = func->isStatic(); isStatic = func->isStatic();
if (func->associatedProperty()) {
if (func->associatedProperty()->status() == Node::Obsolete) {
++c;
continue;
}
}
} }
else if ((*c)->type() == Node::Variable) { else if ((*c)->type() == Node::Variable) {
const VariableNode *var = static_cast<const VariableNode *>(*c); const VariableNode *var = static_cast<const VariableNode *>(*c);

2
src/tools/qdoc/cppcodeparser.cpp
View File

@ -330,11 +330,11 @@ void CppCodeParser::doneParsingHeaderFiles(Tree *tree)
*/ */
void CppCodeParser::doneParsingSourceFiles(Tree *tree) void CppCodeParser::doneParsingSourceFiles(Tree *tree)
{ {
tree->root()->makeUndocumentedChildrenInternal();
tree->root()->clearCurrentChildPointers(); tree->root()->clearCurrentChildPointers();
tree->root()->normalizeOverloads(); tree->root()->normalizeOverloads();
tree->fixInheritance(); tree->fixInheritance();
tree->resolveProperties(); tree->resolveProperties();
tree->root()->makeUndocumentedChildrenInternal();
} }
/*! /*!