summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2020-02-16 12:26:54 +0100
committerTopi Reinio <topi.reinio@qt.io>2020-02-18 18:20:29 +0100
commit9202d454511fa917d7ede2e969c738c20e835675 (patch)
tree2233b43a62edabf1b521a4bdb301dddd43ccf382
parent6c2646cc5a2a0e5db8ba123544cb5f26651f8d51 (diff)
qdoc: Add a test for validating output of QML basic type methods
Task-number: QTBUG-36585 Change-Id: Idbcc701394e1a1f688d3832a88ae5f8948e73c36 Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-int.xml7
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/qml-int.html16
-rw-r--r--tests/auto/qdoc/generatedoutput/qml/parent.qdoc5
3 files changed, 28 insertions, 0 deletions
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-int.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-int.xml
index 2dd4bc1c5..00ef9ec39 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-int.xml
+++ b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-int.xml
@@ -11,4 +11,11 @@
<db:section xml:id="details">
<db:title>Detailed Description</db:title>
</db:section>
+<db:section xml:id="method-documentation">
+<db:title>Method Documentation</db:title>
+<db:section xml:id="abs-method">
+<db:title>int abs()</db:title>
+<db:para>Returns the absolute value of this integer.</db:para>
+</db:section>
+</db:section>
</db:article>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html
index 651f840cb..0b21da628 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html
@@ -15,9 +15,25 @@
<div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">int QML Basic Type</h1>
<span class="subtitle"></span>
+<a name="methods"></a>
+<h2 id="methods">Methods</h2>
+<ul>
+<li class="fn">int <b><b><a href="qml-int.html#abs-method">abs</a></b></b>()</li>
+</ul>
<!-- $$$int-description -->
<div class="descr"> <a name="details"></a>
</div>
<!-- @@@int -->
+<h2>Method Documentation</h2>
+<!-- $$$abs[overload1]$$$abs -->
+<div class="qmlitem"><div class="qmlproto">
+<div class="table"><table class="qmlname">
+<tr valign="top" class="odd" id="abs-method">
+<td class="tblQmlFuncNode"><p>
+<a name="abs-method"></a><span class="type"><a href="qml-int.html">int</a></span> <span class="name">abs</span>()</p></td></tr>
+</table></div></div>
+<div class="qmldoc"><p>Returns the absolute value of this integer.</p>
+</div></div><!-- @@@abs -->
+<br/>
</body>
</html>
diff --git a/tests/auto/qdoc/generatedoutput/qml/parent.qdoc b/tests/auto/qdoc/generatedoutput/qml/parent.qdoc
index e0bed66c0..fed18491c 100644
--- a/tests/auto/qdoc/generatedoutput/qml/parent.qdoc
+++ b/tests/auto/qdoc/generatedoutput/qml/parent.qdoc
@@ -57,3 +57,8 @@
\brief An integer basic type.
*/
+
+/*!
+ \qmlmethod int int::abs()
+ Returns the absolute value of this integer.
+*/