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 <casper.vandonderen@nokia.com>

diff --git a/src/tools/qdoc/cppcodemarker.cpp b/src/tools/qdoc/cppcodemarker.cpp
index 61f8070..166ede9 100644 (file)
--- 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 c95e03f..c072243 100644 (file)
--- 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();
 }
 
 /*!