qdoc: Don't output undocumented functions from Q_OBJECT

Earlier, a test was added to qdoc to ensure that functions added
to class declarations by macros like Q_OBJECT would not cause qdoc
to output warnings that the functions were not documented. But the
undocumented functions were still listed in the documentation. This
update keeps them out of the documentation.

Task-number: QTBUG-66742
Change-Id: I10014341fc7b870ef937ef7f0a303ccc301bf8b5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>

1 files changed, 8 insertions, 0 deletions

diff --git a/src/qdoc/cppcodemarker.cpp b/src/qdoc/cppcodemarker.cpp
index 5bd64ca87..17694e201 100644
--- a/src/qdoc/cppcodemarker.cpp
+++ b/src/qdoc/cppcodemarker.cpp
@@ -560,6 +560,10 @@ QList<Section> CppCodeMarker::sections(const Aggregate *inner,
                             ++c;
                             continue;
                         }
+                        else if (func->isIgnored()) {
+                            ++c;
+                            continue;
+                        }
                     }
                     else if ((*c)->type() == Node::Variable) {
                         const VariableNode *var = static_cast<const VariableNode *>(*c);
@@ -700,6 +704,10 @@ QList<Section> CppCodeMarker::sections(const Aggregate *inner,
                         insert(memberVariables, *c, style, status);
                 } else if ((*c)->isFunction()) {
                     FunctionNode *function = static_cast<FunctionNode *>(*c);
+                    if (function->isIgnored()) {
+                        ++c;
+                        continue;
+                    }
                     if (!function->isSharingComment()) {
                         if (!function->hasAssociatedProperties() || !function->doc().isEmpty())
                             insert(memberFunctions, function, style, status);