From ba6d244fa0a79f24c1b0256de5fec02aaba797bb Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@qt.io>
Date: Fri, 2 Mar 2018 09:12:34 +0100
Subject: qdoc: Don't output undocumented QtGadgetHelper

This update adds QtGadgetHelper to the list of names that are
ignored if they are not documented.

Change-Id: I58ca829d4576c390d78dcd2e0c5a3b75a9fec7de
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
---
 src/qdoc/cppcodemarker.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/qdoc/cppcodemarker.cpp')

diff --git a/src/qdoc/cppcodemarker.cpp b/src/qdoc/cppcodemarker.cpp
index 17694e201..1667f485b 100644
--- a/src/qdoc/cppcodemarker.cpp
+++ b/src/qdoc/cppcodemarker.cpp
@@ -551,7 +551,7 @@ QList<Section> CppCodeMarker::sections(const Aggregate *inner,
                     bool isSlot = false;
                     bool isSignal = false;
                     bool isStatic = false;
-                    if ((*c)->type() == Node::Function) {
+                    if ((*c)->isFunction()) {
                         const FunctionNode *func = (const FunctionNode *) *c;
                         isSlot = (func->isSlot());
                         isSignal = (func->isSignal());
@@ -565,10 +565,16 @@ QList<Section> CppCodeMarker::sections(const Aggregate *inner,
                             continue;
                         }
                     }
-                    else if ((*c)->type() == Node::Variable) {
+                    else if ((*c)->isVariable()) {
                         const VariableNode *var = static_cast<const VariableNode *>(*c);
                         isStatic = var->isStatic();
                     }
+                    else if ((*c)->isTypedef()) {
+                        if ((*c)->name() == QLatin1String("QtGadgetHelper")) {
+                            ++c;
+                            continue;
+                        }
+                    }
 
                     switch ((*c)->access()) {
                     case Node::Public:
@@ -696,6 +702,10 @@ QList<Section> CppCodeMarker::sections(const Aggregate *inner,
                 if ((*c)->isSharingComment()) {
                     // do nothing
                 } else if ((*c)->isEnumType() || (*c)->isTypedef()) {
+                    if ((*c)->name() == QLatin1String("QtGadgetHelper")) {
+                        ++c;
+                        continue;
+                    }
                     insert(memberTypes, *c, style, status);
                 } else if ((*c)->isProperty()) {
                     insert(properties, *c, style, status);
-- 
cgit v1.2.1