diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2020-06-06 22:26:50 +0200 |
|---|---|---|
| committer | Topi Reinio <topi.reinio@qt.io> | 2020-06-08 16:31:10 +0200 |
| commit | 41c601103dd2fef14e59a120e142008f8e3e93cd (patch) | |
| tree | 7480a101732388763ba86d309de9a8a13f424a51 /src/qdoc/node.cpp | |
| parent | 9d9fb9e45d5e30c253b15b565f822a9641488eae (diff) | |
| download | qttools-41c601103dd2fef14e59a120e142008f8e3e93cd.tar.gz | |
qdoc: Fix output for abstract internal QML base types
Abstract QML types propagate their members to the documentation of
the inheriting types; however, this did not happen if the abstract
type was marked \internal. Fix this as it's contrary to how
\qmlabstract is documented.
Fix related issues:
- Skip abstract internal bases from .qhp selectors (as they produced
broken links)
- Skip them also in DocBook generator's \annotatedlist implementation
- Remove unused/duplicated code for QML base types
Fixes: QTBUG-82137
Change-Id: Ic3f2e71bdf30070fb0005333e51052697046e1bc
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/qdoc/node.cpp')
| -rw-r--r-- | src/qdoc/node.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qdoc/node.cpp b/src/qdoc/node.cpp index 911225740..2f0524d94 100644 --- a/src/qdoc/node.cpp +++ b/src/qdoc/node.cpp @@ -1140,7 +1140,7 @@ bool Node::isInternal() const { if (status() == Internal) return true; - return parent() && parent()->status() == Internal; + return parent() && parent()->status() == Internal && !parent()->isAbstract(); } /*! \fn void Node::markInternal() |