diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-22 10:12:13 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-22 10:12:14 +0200 |
| commit | 95cd9078938bcd88fdfbba707911e8111f59f195 (patch) | |
| tree | c55231a843255c0e8fa7d6c94fbf54bc1a9bb9a7 /tests/auto/qdoc/generatedoutput/expected_output/html/testqdoc-test.webxml | |
| parent | 1b992406a6523a144c58baa9bbd1198bb9a2d98c (diff) | |
| parent | b3cdd63d4bdaea09222fb93ffcd5104a2dc0bf2e (diff) | |
Merge remote-tracking branch 'origin/5.15' into 5.15.0
Change-Id: I1fdd80c6b7c2615815acc262f01a3893d28406a3
Diffstat (limited to 'tests/auto/qdoc/generatedoutput/expected_output/html/testqdoc-test.webxml')
| -rw-r--r-- | tests/auto/qdoc/generatedoutput/expected_output/html/testqdoc-test.webxml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/testqdoc-test.webxml b/tests/auto/qdoc/generatedoutput/expected_output/html/testqdoc-test.webxml index d2726cc57..7ae77ec5a 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/html/testqdoc-test.webxml +++ b/tests/auto/qdoc/generatedoutput/expected_output/html/testqdoc-test.webxml @@ -39,7 +39,7 @@ <description/> </function> <function name="someFunction" fullname="TestQDoc::Test::someFunction" href="testqdoc-test.html#someFunction" status="active" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="int" signature="int someFunction(int v)"> - <parameter type="int" name="v" default=""/> + <parameter type="int" name="v" default="0"/> <description> <para>Function that takes a parameter <argument>v</argument>. Also returns the value of <argument>v</argument>.</para> </description> |