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 /tests/auto/qdoc/generatedoutput/testdata | |
| parent | 9d9fb9e45d5e30c253b15b565f822a9641488eae (diff) | |
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 'tests/auto/qdoc/generatedoutput/testdata')
| -rw-r--r-- | tests/auto/qdoc/generatedoutput/testdata/qml/parent.qdoc | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/tests/auto/qdoc/generatedoutput/testdata/qml/parent.qdoc b/tests/auto/qdoc/generatedoutput/testdata/qml/parent.qdoc index a2842f0d6..b52f125e8 100644 --- a/tests/auto/qdoc/generatedoutput/testdata/qml/parent.qdoc +++ b/tests/auto/qdoc/generatedoutput/testdata/qml/parent.qdoc @@ -62,3 +62,23 @@ \qmlmethod int int::abs() Returns the absolute value of this integer. */ + +/*! + \qmltype InternParent + \inqmlmodule QDoc.Test + \internal + \qmlabstract + \brief Internal abstract base QML type. +*/ + +/*! + \qmlproperty int InternParent::prop + \brief Propagated to inheriting type docs. +*/ + +/*! + \qmltype YetAnotherChild + \inherits InternParent + \inqmlmodule QDoc.Test + \brief A type inheriting from internal abstract parent. +*/ |