summaryrefslogtreecommitdiff
path: root/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2022-06-30 11:22:04 +0200
committerTopi Reinio <topi.reinio@qt.io>2022-07-13 11:24:14 +0200
commit64933f72a7d108cc1030fc5cf927485009061dfb (patch)
tree0c82f2a8f9393187e8db72aee257c1d0b528c170 /tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs
parenta4f7cb3c89ab8de4efcc06be918f4644434016aa (diff)
downloadqttools-64933f72a7d108cc1030fc5cf927485009061dfb.tar.gz
qdoc: Make types inherit \since statement from their module docs
When introducing a new module (C++ or QML) documentation, the \module or \qmlmodule topic should be marked with a \since command. Types belonging to the module will then inherit the \since by default, unless explicitly specified in the type documentation. Unify the interface of a similar Tree::resolveUsingClauses() method to explicitly require a reference to an Aggregate for the recursive operation. Fixes: QTBUG-104613 Change-Id: I48afe82e55a889dab43d8c59882c52d44b8bb69a Reviewed-by: Luca Di Sera <luca.disera@qt.io>
Diffstat (limited to 'tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs')
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent.html b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent.html
index 25a3c0f68..cc5618275 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent.html
@@ -23,7 +23,7 @@
<p>Abstract base QML type. <a href="#details">More...</a></p>
<!-- @@@AbstractParent -->
<div class="table"><table class="alignedsummary">
-<tr><td class="memItemLeft rightAlign topAlign"> Import Statement:</td><td class="memItemRight bottomAlign"> import QDoc.Test 1.1</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="qml-qdoc-test-child.html">Child</a></p>
+<tr><td class="memItemLeft rightAlign topAlign"> Import Statement:</td><td class="memItemRight bottomAlign"> import QDoc.Test 1.1</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Since:</td><td class="memItemRight bottomAlign"> Qt 1.1</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="qml-qdoc-test-child.html">Child</a></p>
</td></tr></table></div><ul>
<li><a href="qml-qdoc-test-abstractparent-members.html">List of all members, including inherited members</a></li>
<li>AbstractParent is part of qmltypes.</li>