diff options
| author | Levon Sargsyan <levon.sargsyan@qt.io> | 2019-10-02 16:03:42 +0200 |
|---|---|---|
| committer | Paul Wicking <paul.wicking@qt.io> | 2019-10-03 10:21:17 +0000 |
| commit | 8107d60400f5e5d512246152e7ed35de71e51c6f (patch) | |
| tree | cb78e0bd9fab3e5752b11f8774dc2002af19eed0 /tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html | |
| parent | a7fc802e9fcdad21377a8c4967a70ffc4c050014 (diff) | |
Add new test data for htmlFromCpp test-point
This change introduces several data updates for the test htmlFromCpp,
that will help us prevent possible regressions in the future.
Enhancements include:
1. CPP function with default arguments.
2. Usage of \qtvariable to produce appropriate qmake instructions.
3. Obsolete and deprecated members.
Change-Id: I9e1d346b43f515f649004d180d1ddead67df97b4
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html')
| -rw-r--r-- | tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html index 0c7aa847d..bf7ba3307 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html @@ -25,14 +25,16 @@ <!-- @@@Test --> <div class="table"><table class="alignedsummary"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <Test></span> -</td></tr></table></div><ul> +</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div><ul> <li><a href="testqdoc-test-members.html">List of all members, including inherited members</a></li> +<li><a href="testqdoc-test-obsolete.html">Obsolete members</a></li> </ul> <a name="public-functions"></a> <h2 id="public-functions">Public Functions</h2> <div class="table"><table class="alignedsummary"> <tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#inlineFunction">inlineFunction</a></b>()</td></tr> <tr><td class="memItemLeft rightAlign topAlign"> int </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunction">someFunction</a></b>(int <i>v</i>)</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunctionDefaultArg">someFunctionDefaultArg</a></b>(int <i>i</i>, bool <i>b</i> = false)</td></tr> </table></div> <a name="macros"></a> <h2 id="macros">Macros</h2> @@ -55,6 +57,10 @@ <h3 class="fn" id="someFunction"><a name="someFunction"></a><span class="type">int</span> Test::<span class="name">someFunction</span>(<span class="type">int</span> <i>v</i>)</h3> <p>Function that takes a parameter <i>v</i>. Also returns the value of <i>v</i>.</p> <!-- @@@someFunction --> +<!-- $$$someFunctionDefaultArg[overload1]$$$someFunctionDefaultArgintbool --> +<h3 class="fn" id="someFunctionDefaultArg"><a name="someFunctionDefaultArg"></a><span class="type">void</span> Test::<span class="name">someFunctionDefaultArg</span>(<span class="type">int</span> <i>i</i>, <span class="type">bool</span> <i>b</i> = false)</h3> +<p>Function that takes a parameter <i>i</i> and <i>b</i>.</p> +<!-- @@@someFunctionDefaultArg --> </div> <div class="macros"> <h2>Macro Documentation</h2> |