diff options
| author | Paul Wicking <paul.wicking@qt.io> | 2020-03-06 06:38:01 +0100 |
|---|---|---|
| committer | Paul Wicking <paul.wicking@qt.io> | 2020-03-06 14:54:41 +0100 |
| commit | fcd523048f02025e7563a4a6a17f6e5ff98ca6bb (patch) | |
| tree | 4cfd07631eaf73a259745e2beb96356c539712b8 /tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html | |
| parent | e18472fdd03a1a0633aa153ba8e579be4869fcf3 (diff) | |
QDoc: Use correct node type string for \since in shared comments
Shared comment nodes were not handled as a special case when generating
"This [class/function/method/type/etc] was introduced in" strings when
QDoc encountered a \since command. These ended up with the default
value, "documentation", which led to unexpected text in the
documentation.
* Add handling of shared comment nodes and get the node type from the
first node in the collective.
* Amend generated output test to cover this scenario.
Fixes: QTBUG-82534
Change-Id: I444e95e0214f312649ec2720c23c98e698402abf
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Diffstat (limited to 'tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html')
| -rw-r--r-- | tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html b/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html index 145fc724a..3fc1f2bc7 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html @@ -78,6 +78,7 @@ <div class="fngroup"> <h3 class="fn fngroupitem" id="overload"><a name="overload"></a><code>[protected] </code><span class="type">void</span> Test::<span class="name">overload</span>()</h3><h3 class="fn fngroupitem" id="overload-1"><a name="overload-1"></a><code>[protected] </code><span class="type">void</span> Test::<span class="name">overload</span>(<span class="type">bool</span> <i>b</i>)</h3></div> <p>Overloads that share a documentation comment, optionally taking a parameter <i>b</i>.</p> +<p>This function was introduced in Test 1.2.</p> <!-- @@@ --> <!-- $$$inlineFunction[overload1]$$$inlineFunction --> <h3 class="fn" id="inlineFunction"><a name="inlineFunction"></a><span class="type">void</span> Test::<span class="name">inlineFunction</span>()</h3> |