diff options
| author | Paul Wicking <paul.wicking@qt.io> | 2021-05-21 13:20:47 +0200 |
|---|---|---|
| committer | Paul Wicking <paul.wicking@qt.io> | 2021-05-25 09:52:58 +0200 |
| commit | e8ebf4f0be2349d80c86ca04bfca0bef5cb8c07b (patch) | |
| tree | d97f036644a055d973883f7312294c608a7e9304 /tests | |
| parent | b388defafbb6c9d834e4e3ea45926e4d9efd7c84 (diff) | |
QDoc: clean up html output
Clean up some of QDoc's html output:
* Remove erroneous <p/>.
* Do not write empty <ul></ul> for lists that don't exist.
* Do not generate links with missing href.
* Drop duplicated anchors in tables.
* Stop writing unnecessary and broken links to qml modules.
* Don't duplicate <b>'s.
* Change Atom type to Autolink for Q_INVOKABLE to not generate
broken <a> tag if link target cannot be resolved.
Task-number: QTBUG-81209
Task-number: QTBUG-73026
Fixes: QTBUG-93876
Change-Id: I4e9f01571263a21e0c25e5d8b3b7ff10fc18bea7
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Diffstat (limited to 'tests')
45 files changed, 182 insertions, 168 deletions
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype.html b/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype.html index ebec15929..c8bdbdc71 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype.html @@ -24,7 +24,8 @@ <!-- @@@TestType --> <div class="table"><table class="alignedsummary"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <TestType></span> -</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherits:</td><td class="memItemRight bottomAlign"> <a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></td></tr></table></div><ul> +</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherits:</td><td class="memItemRight bottomAlign"> <a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></td></tr></table></div> +<ul> <li><a href="testtype-members.html">List of all members, including inherited members</a></li> </ul> <h2 id="public-functions">Public Functions</h2> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/seenclass.html b/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/seenclass.html index b1909817a..6346ec6d7 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/seenclass.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/seenclass.html @@ -22,8 +22,7 @@ <div class="table"><table class="alignedsummary"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <SeenClass></span> </td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENTS QDocTest REQUIRED) <br/> -target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div><ul> -</ul> +target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div> <!-- $$$SeenClass-description --> <div class="descr"> <h2 id="details">Detailed Description</h2> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/first.html b/tests/auto/qdoc/generatedoutput/expected_output/first.html index b1d8515c6..79ae81b7f 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/first.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/first.html @@ -18,8 +18,7 @@ <h1 class="title">First Class</h1> <div class="table"><table class="alignedsummary"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <First></span> -</td></tr></table></div><ul> -</ul> +</td></tr></table></div> <!-- $$$First-description --> <div class="descr"> <h2 id="details">Detailed Description</h2> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/globals.html b/tests/auto/qdoc/generatedoutput/expected_output/globals.html index b05971bdc..943907b61 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/globals.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/globals.html @@ -19,8 +19,7 @@ <h1 class="title">Globals Class</h1> <div class="table"><table class="alignedsummary"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <Globals></span> -</td></tr></table></div><ul> -</ul> +</td></tr></table></div> <h2 id="related-non-members">Related Non-Members</h2> <div class="table"><table class="alignedsummary"> <tr><td class="memItemLeft rightAlign topAlign"> int </td><td class="memItemRight bottomAlign"><b><a href="globals.html#foo">foo</a></b>(int <i>a</i>)</td></tr> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/headerfile/testheader.html b/tests/auto/qdoc/generatedoutput/expected_output/headerfile/testheader.html index aebc10a77..e8abcc769 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/headerfile/testheader.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/headerfile/testheader.html @@ -11,8 +11,6 @@ <div class="sidebar"> <div class="toc"> <h3 id="toc">Contents</h3> -<ul> -</ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> <h1 class="title"><TestHeader> - Test Header</h1> @@ -21,8 +19,7 @@ <!-- @@@<TestHeader> --> <div class="table"><table class="alignedsummary"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <TestHeader></span> -</td></tr></table></div><ul> -</ul> +</td></tr></table></div> <h2 id="types">Types</h2> <div class="table"><table class="alignedsummary"> <tr><td class="memItemLeft rightAlign topAlign"> enum </td><td class="memItemRight bottomAlign"><b><a href="testheader.html#Globals-enum">Globals</a></b> { Glo, Bal }</td></tr> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc-test.html b/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc-test.html index 3c27e65b6..58b61d1db 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc-test.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc-test.html @@ -29,7 +29,8 @@ <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <Test></span> </td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENTS QDocTest REQUIRED) <br/> target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p> -</td></tr></table></div><ul> +</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">Deprecated members</a></li> </ul> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html b/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html index e78deeb99..289712177 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html @@ -24,8 +24,7 @@ <div class="table"><table class="alignedsummary"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <TestCPP></span> </td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENTS QDocTest REQUIRED) <br/> -target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div><ul> -</ul> +target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div> <h2 id="classes">Classes</h2> <div class="table"><table class="alignedsummary"> <tr><td class="memItemLeft rightAlign topAlign"> class </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html">Test</a></b></td></tr> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent-members.html b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent-members.html index e8ecfbb69..1ca034caf 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent-members.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent-members.html @@ -10,8 +10,8 @@ <h1 class="title">List of All Members for AbstractParent</h1> <p>This is the complete list of members for <a href="qml-qdoc-test-abstractparent.html">AbstractParent</a>, including inherited members.</p> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-abstractparent.html#children-prop">children</a></b></b> : list<Child> [default]</li> -<li class="fn">void <b><b><a href="qml-qdoc-test-abstractparent.html#rear-method">rear</a></b></b>(Child <i>child</i>)</li> +<li class="fn"><b><a href="qml-qdoc-test-abstractparent.html#children-prop">children</a></b> : list<Child> [default]</li> +<li class="fn">void <b><a href="qml-qdoc-test-abstractparent.html#rear-method">rear</a></b>(Child <i>child</i>)</li> </ul> </body> </html> 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 dda065dff..0c11a6711 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 @@ -27,11 +27,11 @@ </ul> <h2 id="properties">Properties</h2> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-abstractparent.html#children-prop">children</a></b></b> : list<Child></li> +<li class="fn"><b><a href="qml-qdoc-test-abstractparent.html#children-prop">children</a></b> : list<Child></li> </ul> <h2 id="methods">Methods</h2> <ul> -<li class="fn">void <b><b><a href="qml-qdoc-test-abstractparent.html#rear-method">rear</a></b></b>(Child <i>child</i>)</li> +<li class="fn">void <b><a href="qml-qdoc-test-abstractparent.html#rear-method">rear</a></b>(Child <i>child</i>)</li> </ul> <!-- $$$AbstractParent-description --> <h2 id="details">Detailed Description</h2> @@ -42,7 +42,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="children-prop"> -<td class="tblQmlPropNode"><p id="children-prop"> +<td class="tblQmlPropNode"><p> <span class="qmlextra">[default] </span><span class="name">children</span> : <span class="type">list</span><<span class="type"><a href="qml-qdoc-test-child.html">Child</a></span>></p></td></tr> </table></div></div> <div class="qmldoc"><p>Children of the type.</p> @@ -54,7 +54,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="rear-method"> -<td class="tblQmlFuncNode"><p id="rear-method"> +<td class="tblQmlFuncNode"><p> <span class="type">void</span> <span class="name">rear</span>(<span class="type"><a href="qml-qdoc-test-child.html">Child</a></span> <i>child</i>)</p></td></tr> </table></div></div> <div class="qmldoc"><p>Do some abstract parenting on <i>child</i>.</p> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/index.html b/tests/auto/qdoc/generatedoutput/expected_output/index.html index defe95c26..a17504a08 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/index.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/index.html @@ -11,7 +11,7 @@ <div class="descr" id="details"> <div class="table"><table class="annotated"> <tr class="odd topAlign"><td class="tblName"><p><a href="first.html">First</a></p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="">First::Nested</a></p></td></tr> +<tr class="even topAlign"><td class="tblName"><p>First::Nested</p></td></tr> <tr class="odd topAlign"><td class="tblName"><p><a href="second.html">Second</a></p></td></tr> <tr class="even topAlign"><td class="tblName"><p><a href="third.html">Third</a></p></td></tr> </table></div> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived.html b/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived.html index 5076b093c..f6fd4a662 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived.html @@ -29,7 +29,8 @@ <div class="table"><table class="alignedsummary"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <TestDerived></span> </td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENTS QDocTest REQUIRED) <br/> -target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherits:</td><td class="memItemRight bottomAlign"> <a href="testqdoc-test.html">TestQDoc::Test</a></td></tr></table></div><ul> +target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherits:</td><td class="memItemRight bottomAlign"> <a href="testqdoc-test.html">TestQDoc::Test</a></td></tr></table></div> +<ul> <li><a href="testqdoc-testderived-members.html">List of all members, including inherited members</a></li> <li><a href="testqdoc-testderived-obsolete.html">Deprecated members</a></li> </ul> @@ -144,7 +145,7 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr><tr><td class="me <!-- $$$invokeMe[overload1]$$$invokeMe --> <h3 class="fn" id="invokeMe"><code>[invokable] </code><span class="type">void</span> TestDerived::<span class="name">invokeMe</span>() const</h3> <p>Something invokable.</p> -<p><b>Note: </b>This function can be invoked via the meta-object system and from QML. See Q_INVOKABLE</a>.</p> +<p><b>Note: </b>This function can be invoked via the meta-object system and from QML. See Q_INVOKABLE.</p> <!-- @@@invokeMe --> <!-- $$$virtualFun[overload1]$$$virtualFun --> <h3 class="fn" id="virtualFun"><code>[override virtual] </code><span class="type">void</span> TestDerived::<span class="name">virtualFun</span>()</h3> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html index 4d446c159..3dca3f698 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html @@ -12,7 +12,7 @@ <p class="naviNextPrevious headerNavi"> <a class="prevPage" href="qdoctests-qdocfileoutput.html">QDoc Testing</a> <a class="nextPage" href="toc.html">Table of Contents</a> -</p><p/> +</p> <div class="sidebar"> <div class="toc"> <h3 id="toc">Contents</h3> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html index 94f0c9a1f..325fbdec9 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html @@ -10,7 +10,7 @@ <link rel="next" href="qdoctests-qdocfileoutput-linking.html" /> <p class="naviNextPrevious headerNavi"> <a class="nextPage" href="qdoctests-qdocfileoutput-linking.html">QDoc Linking Test</a> -</p><p/> +</p> <div class="sidebar"> <div class="toc"> <h3 id="toc">Contents</h3> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html index 66f3d66ee..77c951c05 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html @@ -18,7 +18,7 @@ <h1 class="title">int QML Basic Type</h1> <h2 id="methods">Methods</h2> <ul> -<li class="fn">int <b><b><a href="qml-int.html#abs-method">abs</a></b></b>()</li> +<li class="fn">int <b><a href="qml-int.html#abs-method">abs</a></b>()</li> </ul> <!-- $$$int-description --> <div class="descr" id="details"> @@ -29,7 +29,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="abs-method"> -<td class="tblQmlFuncNode"><p id="abs-method"> +<td class="tblQmlFuncNode"><p> <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> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-linkmodule-grandchild-members.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-linkmodule-grandchild-members.html index e0f8fdcae..8052be015 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-linkmodule-grandchild-members.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-linkmodule-grandchild-members.html @@ -11,14 +11,14 @@ <p>This is the complete list of members for <a href="qml-linkmodule-grandchild.html">GrandChild</a>, including inherited members.</p> <p>The following members are inherited from <a href="qml-qdoc-test-anotherchild.html">AnotherChild</a>.</p> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-anotherchild.html#name-prop">name</a></b></b> : string</li> +<li class="fn"><b><a href="qml-qdoc-test-anotherchild.html#name-prop">name</a></b> : string</li> </ul> <p>The following members are inherited from <a href="qml-qdoc-test-parent.html">Parent</a>.</p> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-parent.html#group-prop">group</a></b></b> : </li> -<li class="fn"><b><b><a href="qml-qdoc-test-parent.html#group.a-prop">group.a</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-parent.html#group.b-prop">group.b</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-parent.html#group.c-prop">group.c</a></b></b> : int</li> +<li class="fn"><b><a href="qml-qdoc-test-parent.html#group-prop">group</a></b> : </li> +<li class="fn"><b><a href="qml-qdoc-test-parent.html#group.a-prop">group.a</a></b> : int</li> +<li class="fn"><b><a href="qml-qdoc-test-parent.html#group.b-prop">group.b</a></b> : int</li> +<li class="fn"><b><a href="qml-qdoc-test-parent.html#group.c-prop">group.c</a></b> : int</li> </ul> </body> </html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-abstractparent.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-abstractparent.html index 873f38694..32165b273 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-abstractparent.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-abstractparent.html @@ -27,14 +27,14 @@ </ul> <h2 id="properties">Properties</h2> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-abstractparent.html#children-prop">children</a></b></b> : list<Child></li> -<li class="fn"><b><b><a href="qml-qdoc-test-abstractparent.html#name-prop">name</a></b></b> : string</li> +<li class="fn"><b><a href="qml-qdoc-test-abstractparent.html#children-prop">children</a></b> : list<Child></li> +<li class="fn"><b><a href="qml-qdoc-test-abstractparent.html#name-prop">name</a></b> : string</li> </ul> <h2 id="methods">Methods</h2> <ul> -<li class="fn">void <b><b><a href="qml-qdoc-test-abstractparent.html#name-method-1">name</a></b></b>()</li> -<li class="fn">void <b><b><a href="qml-qdoc-test-abstractparent.html#name-method">name</a></b></b>(Child <i>child</i>, <i>name</i>)</li> -<li class="fn">void <b><b><a href="qml-qdoc-test-abstractparent.html#rear-method">rear</a></b></b>(Child <i>child</i>, var <i>method</i>)</li> +<li class="fn">void <b><a href="qml-qdoc-test-abstractparent.html#name-method-1">name</a></b>()</li> +<li class="fn">void <b><a href="qml-qdoc-test-abstractparent.html#name-method">name</a></b>(Child <i>child</i>, <i>name</i>)</li> +<li class="fn">void <b><a href="qml-qdoc-test-abstractparent.html#rear-method">rear</a></b>(Child <i>child</i>, var <i>method</i>)</li> </ul> <!-- $$$AbstractParent-description --> <h2 id="details">Detailed Description</h2> @@ -44,7 +44,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="children-prop"> -<td class="tblQmlPropNode"><p id="children-prop"> +<td class="tblQmlPropNode"><p> <span class="qmlextra">[default] </span><span class="name">children</span> : <span class="type">list</span><<span class="type"><a href="qml-qdoc-test-child.html">Child</a></span>></p></td></tr> </table></div></div> <div class="qmldoc"><p>Children of the type.</p> @@ -54,7 +54,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="name-prop"> -<td class="tblQmlPropNode"><p id="name-prop"> +<td class="tblQmlPropNode"><p> <span class="name">name</span> : <span class="type">string</span></p></td></tr> </table></div></div> <div class="qmldoc"><p>Name of this parent.</p> @@ -65,7 +65,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="name-method-1"> -<td class="tblQmlFuncNode"><p id="name-method-1"> +<td class="tblQmlFuncNode"><p> <span class="type">void</span> <span class="name">name</span>()</p></td></tr> </table></div></div> <div class="qmldoc"><p>Name all children with random names.</p> @@ -75,7 +75,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="name-method"> -<td class="tblQmlFuncNode"><p id="name-method"> +<td class="tblQmlFuncNode"><p> <span class="type">void</span> <span class="name">name</span>(<span class="type"><a href="qml-qdoc-test-child.html">Child</a></span> <i>child</i>, <i>name</i>)</p></td></tr> </table></div></div> <div class="qmldoc"><p>Name a <i>child</i> using <i>name</i>.</p> @@ -85,7 +85,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="rear-method"> -<td class="tblQmlFuncNode"><p id="rear-method"> +<td class="tblQmlFuncNode"><p> <span class="type">void</span> <span class="name">rear</span>(<span class="type"><a href="qml-qdoc-test-child.html">Child</a></span> <i>child</i>, <span class="type">var</span> <i>method</i> = Strict)</p></td></tr> </table></div></div> <div class="qmldoc"><p>Do some abstract parenting on <i>child</i> using a specific <i>method</i>.</p> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-child.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-child.html index 4cdebba6b..5cf37e732 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-child.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-child.html @@ -27,14 +27,14 @@ </ul> <h2 id="properties">Properties</h2> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-child.html#children-prop">children</a></b></b> : list<Child></li> -<li class="fn"><b><b><a href="qml-qdoc-test-child.html#name-prop">name</a></b></b> : string</li> +<li class="fn"><b><a href="qml-qdoc-test-child.html#children-prop">children</a></b> : list<Child></li> +<li class="fn"><b><a href="qml-qdoc-test-child.html#name-prop">name</a></b> : string</li> </ul> <h2 id="methods">Methods</h2> <ul> -<li class="fn">void <b><b><a href="qml-qdoc-test-child.html#name-method-1">name</a></b></b>()</li> -<li class="fn">void <b><b><a href="qml-qdoc-test-child.html#name-method">name</a></b></b>(Child <i>child</i>, <i>name</i>)</li> -<li class="fn">void <b><b><a href="qml-qdoc-test-child.html#rear-method">rear</a></b></b>(Child <i>child</i>, var <i>method</i>)</li> +<li class="fn">void <b><a href="qml-qdoc-test-child.html#name-method-1">name</a></b>()</li> +<li class="fn">void <b><a href="qml-qdoc-test-child.html#name-method">name</a></b>(Child <i>child</i>, <i>name</i>)</li> +<li class="fn">void <b><a href="qml-qdoc-test-child.html#rear-method">rear</a></b>(Child <i>child</i>, var <i>method</i>)</li> </ul> <!-- $$$Child-description --> <h2 id="details">Detailed Description</h2> @@ -44,7 +44,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="children-prop"> -<td class="tblQmlPropNode"><p id="children-prop"> +<td class="tblQmlPropNode"><p> <span class="qmlextra">[default] </span><span class="name">children</span> : <span class="type">list</span><<span class="type"><a href="qml-qdoc-test-child.html">Child</a></span>></p></td></tr> </table></div></div> <div class="qmldoc"><p>Children of the type.</p> @@ -54,7 +54,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="name-prop"> -<td class="tblQmlPropNode"><p id="name-prop"> +<td class="tblQmlPropNode"><p> <span class="name">name</span> : <span class="type">string</span></p></td></tr> </table></div></div> <div class="qmldoc"><p>Name of this child.</p> @@ -65,7 +65,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="name-method-1"> -<td class="tblQmlFuncNode"><p id="name-method-1"> +<td class="tblQmlFuncNode"><p> <span class="type">void</span> <span class="name">name</span>()</p></td></tr> </table></div></div> <div class="qmldoc"><p>Name all children with random names.</p> @@ -75,7 +75,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="name-method"> -<td class="tblQmlFuncNode"><p id="name-method"> +<td class="tblQmlFuncNode"><p> <span class="type">void</span> <span class="name">name</span>(<span class="type"><a href="qml-qdoc-test-child.html">Child</a></span> <i>child</i>, <i>name</i>)</p></td></tr> </table></div></div> <div class="qmldoc"><p>Name a <i>child</i> of this child using <i>name</i>.</p> @@ -85,7 +85,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="rear-method"> -<td class="tblQmlFuncNode"><p id="rear-method"> +<td class="tblQmlFuncNode"><p> <span class="type">void</span> <span class="name">rear</span>(<span class="type"><a href="qml-qdoc-test-child.html">Child</a></span> <i>child</i>, <span class="type">var</span> <i>method</i> = Strict)</p></td></tr> </table></div></div> <div class="qmldoc"><p>Do some abstract parenting on <i>child</i> using a specific <i>method</i>.</p> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-doctest.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-doctest.html index 79e3bd909..1576d12ce 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-doctest.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-doctest.html @@ -28,18 +28,18 @@ </ul> <h2 id="properties">Properties</h2> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-doctest.html#active-prop">active</a></b></b> : bool</li> -<li class="fn"><b><b><a href="qml-qdoc-test-doctest.html#name-prop">name</a></b></b> : string</li> +<li class="fn"><b><a href="qml-qdoc-test-doctest.html#active-prop">active</a></b> : bool</li> +<li class="fn"><b><a href="qml-qdoc-test-doctest.html#name-prop">name</a></b> : string</li> </ul> <h2 id="signals">Signals</h2> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-doctest.html#completed-signal">completed</a></b></b>()</li> -<li class="fn"><b><b><a href="qml-qdoc-test-doctest.html#foo-signal">foo</a></b></b>(var <i>bar</i>)</li> +<li class="fn"><b><a href="qml-qdoc-test-doctest.html#completed-signal">completed</a></b>()</li> +<li class="fn"><b><a href="qml-qdoc-test-doctest.html#foo-signal">foo</a></b>(var <i>bar</i>)</li> </ul> <h2 id="methods">Methods</h2> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-doctest.html#fail-method">fail</a></b></b>(<i>message</i>)</li> -<li class="fn"><b><b><a href="qml-qdoc-test-doctest.html#fail_hard-method">fail_hard</a></b></b>(<i>msg</i>, <i>option</i>)</li> +<li class="fn"><b><a href="qml-qdoc-test-doctest.html#fail-method">fail</a></b>(<i>message</i>)</li> +<li class="fn"><b><a href="qml-qdoc-test-doctest.html#fail_hard-method">fail_hard</a></b>(<i>msg</i>, <i>option</i>)</li> </ul> <!-- $$$DocTest-description --> <h2 id="details">Detailed Description</h2> @@ -51,7 +51,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="active-prop"> -<td class="tblQmlPropNode"><p id="active-prop"> +<td class="tblQmlPropNode"><p> <span class="qmlextra">[default: true] </span><span class="name">active</span> : <span class="type">bool</span></p></td></tr> </table></div></div> <div class="qmldoc"><p>Whether the test is active.</p> @@ -62,7 +62,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="name-prop"> -<td class="tblQmlPropNode"><p id="name-prop"> +<td class="tblQmlPropNode"><p> <span class="qmlextra">[required] </span><span class="name">name</span> : <span class="type">string</span></p></td></tr> </table></div></div> <div class="qmldoc"><p>Name of the test.</p> @@ -77,7 +77,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="completed-signal"> -<td class="tblQmlFuncNode"><p id="completed-signal"> +<td class="tblQmlFuncNode"><p> <span class="name">completed</span>()</p></td></tr> </table></div></div> <div class="qmldoc"><p><b>Note: </b>The corresponding handler is <code>onCompleted</code>.</p> @@ -87,7 +87,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="foo-signal"> -<td class="tblQmlFuncNode"><p id="foo-signal"> +<td class="tblQmlFuncNode"><p> <span class="name">foo</span>(<span class="type">var</span> <i>bar</i>)</p></td></tr> </table></div></div> <div class="qmldoc"><p>Signal with parameter <i>bar</i>.</p> @@ -99,7 +99,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="fail-method"> -<td class="tblQmlFuncNode"><p id="fail-method"> +<td class="tblQmlFuncNode"><p> <code>[since QDoc.Test 1.0] </code><span class="name">fail</span>(<i>message</i> = "oops")</p></td></tr> </table></div></div> <div class="qmldoc"><p>Fails the current test case, with the optional <i>message</i>.</p> @@ -110,7 +110,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="fail_hard-method"> -<td class="tblQmlFuncNode"><p id="fail_hard-method"> +<td class="tblQmlFuncNode"><p> <span class="name">fail_hard</span>(<i>msg</i> = "facepalm", <i>option</i> = 123)</p></td></tr> </table></div></div> <div class="qmldoc"><p>Fails the current test case, hard.</p> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-members.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-members.html index 2b91b66fe..bfbbb204d 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-members.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-members.html @@ -10,24 +10,24 @@ <h1 class="title">List of All Members for Type</h1> <p>This is the complete list of members for <a href="qml-qdoc-test-type.html">Type</a>, including inherited members.</p> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#fifth-prop">fifth</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#fourth-prop">fourth</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#group-prop">group</a></b></b><ul> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#group.first-prop">group.first</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#group.second-prop">group.second</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#group.third-prop">group.third</a></b></b> : int</li> +<li class="fn"><b><a href="qml-qdoc-test-type.html#fifth-prop">fifth</a></b> : int</li> +<li class="fn"><b><a href="qml-qdoc-test-type.html#fourth-prop">fourth</a></b> : int</li> +<li class="fn"><b><a href="qml-qdoc-test-type.html#group-prop">group</a></b><ul> +<li class="fn"><b><a href="qml-qdoc-test-type.html#group.first-prop">group.first</a></b> : int</li> +<li class="fn"><b><a href="qml-qdoc-test-type.html#group.second-prop">group.second</a></b> : int</li> +<li class="fn"><b><a href="qml-qdoc-test-type.html#group.third-prop">group.third</a></b> : int</li> </ul> </li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#id-prop">id</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#name-prop">name</a></b></b> : string</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#type-attached-prop">type</a></b></b> : enumeration [attached]</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#completed-signal">completed</a></b></b>(int <i>status</i>)</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#configured-signal">configured</a></b></b>() [attached]</li> -<li class="fn">Type <b><b><a href="qml-qdoc-test-type.html#copy-method">copy</a></b></b>(<i>a</i>)</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type-obsolete.html#deprecatedMethod-method">deprecatedMethod</a></b></b>()<code> (deprecated since 6.2)</code></li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#disable-method">disable</a></b></b>()</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#enable-method">enable</a></b></b>()</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#group.created-signal">group.created</a></b></b>()</li> +<li class="fn"><b><a href="qml-qdoc-test-type.html#id-prop">id</a></b> : int</li> +<li class="fn"><b><a href="qml-qdoc-test-type.html#name-prop">name</a></b> : string</li> +<li class="fn"><b><a href="qml-qdoc-test-type.html#type-attached-prop">type</a></b> : enumeration [attached]</li> +<li class="fn"><b><a href="qml-qdoc-test-type.html#completed-signal">completed</a></b>(int <i>status</i>)</li> +<li class="fn"><b><a href="qml-qdoc-test-type.html#configured-signal">configured</a></b>() [attached]</li> +<li class="fn">Type <b><a href="qml-qdoc-test-type.html#copy-method">copy</a></b>(<i>a</i>)</li> +<li class="fn"><b><a href="qml-qdoc-test-type-obsolete.html#deprecatedMethod-method">deprecatedMethod</a></b>()<code> (deprecated since 6.2)</code></li> +<li class="fn"><b><a href="qml-qdoc-test-type.html#disable-method">disable</a></b>()</li> +<li class="fn"><b><a href="qml-qdoc-test-type.html#enable-method">enable</a></b>()</li> +<li class="fn"><b><a href="qml-qdoc-test-type.html#group.created-signal">group.created</a></b>()</li> </ul> </body> </html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-obsolete.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-obsolete.html index 164c56a36..2c2e00b29 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-obsolete.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-obsolete.html @@ -11,14 +11,14 @@ <p><b>The following members of QML type <a href="qml-qdoc-test-type.html">Type</a> are deprecated.</b> They are provided to keep old source code working. We strongly advise against using them in new code.</p> <h2 id="methods">Methods</h2> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-type-obsolete.html#deprecatedMethod-method">deprecatedMethod</a></b></b>()<code> (deprecated since 6.2)</code></li> +<li class="fn"><b><a href="qml-qdoc-test-type-obsolete.html#deprecatedMethod-method">deprecatedMethod</a></b>()<code> (deprecated since 6.2)</code></li> </ul> <h2>Method Documentation</h2> <!-- $$$deprecatedMethod[overload1]$$$deprecatedMethod --> <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="deprecatedMethod-method"> -<td class="tblQmlFuncNode"><p id="deprecatedMethod-method"> +<td class="tblQmlFuncNode"><p> <span class="name">deprecatedMethod</span>()</p></td></tr> </table></div></div> <div class="qmldoc"><p>This method is deprecated since 6.2. We strongly advise against using it in new code.</p> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html index 57c0f0da0..ecb295135 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html @@ -24,41 +24,41 @@ <p>A QML type documented in a .cpp file. <a href="#details">More...</a></p> <!-- @@@Type --> <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"> Instantiates:</td><td class="memItemRight bottomAlign"> <a href="qml-qdoc-test-type.html"><a href="testqdoc-test.html">Test</a></td></tr></table></div><ul> +<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"> Instantiates:</td><td class="memItemRight bottomAlign"> <a href="testqdoc-test.html">Test</a></td></tr></table></div><ul> <li><a href="qml-qdoc-test-type-members.html">List of all members, including inherited members</a></li> <li><a href="qml-qdoc-test-type-obsolete.html">Deprecated members</a></li> </ul> <h2 id="properties">Properties</h2> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#fifth-prop">fifth</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#fourth-prop">fourth</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#group-prop">group</a></b></b><ul> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#group.first-prop">group.first</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#group.second-prop">group.second</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#group.third-prop">group.third</a></b></b> : int</li> +<li class="fn"><b><a href="qml-qdoc-test-type.html#fifth-prop">fifth</a></b> : int</li> +<li class="fn"><b><a href="qml-qdoc-test-type.html#fourth-prop">fourth</a></b> : int</li> +<li class="fn"><b><a href="qml-qdoc-test-type.html#group-prop">group</a></b><ul> +<li class="fn"><b><a href="qml-qdoc-test-type.html#group.first-prop">group.first</a></b> : int</li> +<li class="fn"><b><a href="qml-qdoc-test-type.html#group.second-prop">group.second</a></b> : int</li> +<li class="fn"><b><a href="qml-qdoc-test-type.html#group.third-prop">group.third</a></b> : int</li> </ul> </li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#id-prop">id</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#name-prop">name</a></b></b> : string</li> +<li class="fn"><b><a href="qml-qdoc-test-type.html#id-prop">id</a></b> : int</li> +<li class="fn"><b><a href="qml-qdoc-test-type.html#name-prop">name</a></b> : string</li> </ul> <h2 id="attached-properties">Attached Properties</h2> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#type-attached-prop">type</a></b></b> : enumeration</li> +<li class="fn"><b><a href="qml-qdoc-test-type.html#type-attached-prop">type</a></b> : enumeration</li> </ul> <h2 id="signals">Signals</h2> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#completed-signal">completed</a></b></b>(int <i>status</i>)</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#group.created-signal">group.created</a></b></b>()</li> +<li class="fn"><b><a href="qml-qdoc-test-type.html#completed-signal">completed</a></b>(int <i>status</i>)</li> +<li class="fn"><b><a href="qml-qdoc-test-type.html#group.created-signal">group.created</a></b>()</li> </ul> <h2 id="attached-signals">Attached Signals</h2> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#configured-signal">configured</a></b></b>()</li> +<li class="fn"><b><a href="qml-qdoc-test-type.html#configured-signal">configured</a></b>()</li> </ul> <h2 id="methods">Methods</h2> <ul> -<li class="fn">Type <b><b><a href="qml-qdoc-test-type.html#copy-method">copy</a></b></b>(<i>a</i>)</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#disable-method">disable</a></b></b>()</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#enable-method">enable</a></b></b>()</li> +<li class="fn">Type <b><a href="qml-qdoc-test-type.html#copy-method">copy</a></b>(<i>a</i>)</li> +<li class="fn"><b><a href="qml-qdoc-test-type.html#disable-method">disable</a></b>()</li> +<li class="fn"><b><a href="qml-qdoc-test-type.html#enable-method">enable</a></b>()</li> </ul> <!-- $$$Type-description --> <h2 id="details">Detailed Description</h2> @@ -69,10 +69,10 @@ <div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="fifth-prop"> -<td class="tblQmlPropNode"><p id="fifth-prop"> +<td class="tblQmlPropNode"><p> <span class="name">fifth</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> <tr valign="top" class="odd" id="fourth-prop"> -<td class="tblQmlPropNode"><p id="fourth-prop"> +<td class="tblQmlPropNode"><p> <span class="name">fourth</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> </table></div></div> </div><div class="qmldoc"><p>A group of properties sharing a documentation comment.</p> @@ -83,13 +83,13 @@ <div class="table"><table class="qmlname"> <tr valign="top" class="even" id="group-prop"><th class="centerAlign"><p><b>group group</b></p></th></tr> <tr valign="top" class="odd" id="group.first-prop"> -<td class="tblQmlPropNode"><p id="group.first-prop"> +<td class="tblQmlPropNode"><p> <span class="name">group.first</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> <tr valign="top" class="odd" id="group.second-prop"> -<td class="tblQmlPropNode"><p id="group.second-prop"> +<td class="tblQmlPropNode"><p> <span class="name">group.second</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> <tr valign="top" class="odd" id="group.third-prop"> -<td class="tblQmlPropNode"><p id="group.third-prop"> +<td class="tblQmlPropNode"><p> <span class="name">group.third</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> </table></div></div> <div class="qmldoc"><p>A property group.</p> @@ -99,7 +99,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="id-prop"> -<td class="tblQmlPropNode"><p id="id-prop"> +<td class="tblQmlPropNode"><p> <span class="qmlextra">[read-only] </span><span class="name">id</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> </table></div></div> <div class="qmldoc"><p>A read-only property.</p> @@ -109,7 +109,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="name-prop"> -<td class="tblQmlPropNode"><p id="name-prop"> +<td class="tblQmlPropNode"><p> <span class="qmlextra">[required] </span><span class="name">name</span> : <span class="type">string</span></p></td></tr> </table></div></div> <div class="qmldoc"><p>Name of the Test.</p> @@ -120,7 +120,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="type-attached-prop"> -<td class="tblQmlPropNode"><p id="type-attached-prop"> +<td class="tblQmlPropNode"><p> <span class="qmlextra">[default: Type.NoType] </span><span class="name">Type.type</span> : <span class="type">enumeration</span></p></td></tr> </table></div></div> <div class="qmldoc"><div class="table"><table class="valuelist"><tr valign="top" class="odd"><th class="tblConst">Constant</th><th class="tbldscr">Description</th></tr> @@ -134,7 +134,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="completed-signal"> -<td class="tblQmlFuncNode"><p id="completed-signal"> +<td class="tblQmlFuncNode"><p> <span class="name">completed</span>(<span class="type"><a href="qml-int.html">int</a></span> <i>status</i>)</p></td></tr> </table></div></div> <div class="qmldoc"><p>This signal is emitted when the operation completed with <i>status</i>.</p> @@ -145,7 +145,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="group.created-signal"> -<td class="tblQmlFuncNode"><p id="group.created-signal"> +<td class="tblQmlFuncNode"><p> <span class="name">group.created</span>()</p></td></tr> </table></div></div> <div class="qmldoc"><p>This signal is prefixed with <i>group</i>.</p> @@ -157,7 +157,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="configured-signal"> -<td class="tblQmlFuncNode"><p id="configured-signal"> +<td class="tblQmlFuncNode"><p> <span class="name">configured</span>()</p></td></tr> </table></div></div> <div class="qmldoc"><p>This attached signal is emitted when the type was configured.</p> @@ -170,10 +170,10 @@ <div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="disable-method"> -<td class="tblQmlFuncNode"><p id="disable-method"> +<td class="tblQmlFuncNode"><p> <span class="name">disable</span>()</p></td></tr> <tr valign="top" class="odd" id="enable-method"> -<td class="tblQmlFuncNode"><p id="enable-method"> +<td class="tblQmlFuncNode"><p> <span class="name">enable</span>()</p></td></tr> </table></div></div> </div><div class="qmldoc"><p>Enables or disables this type.</p> @@ -183,7 +183,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="copy-method"> -<td class="tblQmlFuncNode"><p id="copy-method"> +<td class="tblQmlFuncNode"><p> <span class="type"><a href="qml-qdoc-test-type.html">Type</a></span> <span class="name">copy</span>(<i>a</i>)</p></td></tr> </table></div></div> <div class="qmldoc"><p>Returns another Type based on <i>a</i>.</p> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-yetanotherchild.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-yetanotherchild.html index b0e12e1b8..074fb30d9 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-yetanotherchild.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-yetanotherchild.html @@ -25,7 +25,7 @@ </ul> <h2 id="properties">Properties</h2> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-yetanotherchild.html#prop-prop">prop</a></b></b> : int</li> +<li class="fn"><b><a href="qml-qdoc-test-yetanotherchild.html#prop-prop">prop</a></b> : int</li> </ul> <!-- $$$YetAnotherChild-description --> <h2 id="details">Detailed Description</h2> @@ -35,7 +35,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="prop-prop"> -<td class="tblQmlPropNode"><p id="prop-prop"> +<td class="tblQmlPropNode"><p> <span class="name">prop</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> </table></div></div> <div class="qmldoc"><p>Propagated to inheriting type docs.</p> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-test-nover-typenoversion.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-test-nover-typenoversion.html index 2382d6a32..92cf4a514 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-test-nover-typenoversion.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-test-nover-typenoversion.html @@ -19,7 +19,7 @@ <p>Another QML type documented in a .cpp file. <a href="#details">More...</a></p> <!-- @@@TypeNoVersion --> <div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> Import Statement:</td><td class="memItemRight bottomAlign"> import Test.NoVer</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Instantiates:</td><td class="memItemRight bottomAlign"> <a href="qml-test-nover-typenoversion.html"><a href="testqdoc-testderived.html">TestDerived</a></td></tr></table></div><ul> +<tr><td class="memItemLeft rightAlign topAlign"> Import Statement:</td><td class="memItemRight bottomAlign"> import Test.NoVer</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Instantiates:</td><td class="memItemRight bottomAlign"> <a href="testqdoc-testderived.html">TestDerived</a></td></tr></table></div><ul> <li><a href="qml-test-nover-typenoversion-members.html">List of all members, including inherited members</a></li> </ul> <!-- $$$TypeNoVersion-description --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html index f6db51dc1..af59ed21d 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html @@ -25,11 +25,11 @@ </ul> <h2 id="properties">Properties</h2> <ul> -<li class="fn"><b><b><a href="qml-uicomponents-progressbar.html#color-prop">color</a></b></b> : color</li> -<li class="fn"><b><b><a href="qml-uicomponents-progressbar.html#maximum-prop">maximum</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-uicomponents-progressbar.html#minimum-prop">minimum</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-uicomponents-progressbar.html#secondColor-prop">secondColor</a></b></b> : color</li> -<li class="fn"><b><b><a href="qml-uicomponents-progressbar.html#value-prop">value</a></b></b> : int</li> +<li class="fn"><b><a href="qml-uicomponents-progressbar.html#color-prop">color</a></b> : color</li> +<li class="fn"><b><a href="qml-uicomponents-progressbar.html#maximum-prop">maximum</a></b> : int</li> +<li class="fn"><b><a href="qml-uicomponents-progressbar.html#minimum-prop">minimum</a></b> : int</li> +<li class="fn"><b><a href="qml-uicomponents-progressbar.html#secondColor-prop">secondColor</a></b> : color</li> +<li class="fn"><b><a href="qml-uicomponents-progressbar.html#value-prop">value</a></b> : int</li> </ul> <!-- $$$ProgressBar-description --> <h2 id="details">Detailed Description</h2> @@ -42,7 +42,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="color-prop"> -<td class="tblQmlPropNode"><p id="color-prop"> +<td class="tblQmlPropNode"><p> <span class="name">color</span> : <span class="type">color</span></p></td></tr> </table></div></div> <div class="qmldoc"><p>The color of the <a href="qml-uicomponents-progressbar.html">ProgressBar</a>'s gradient. Must bind to a color type.</p> @@ -53,7 +53,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="maximum-prop"> -<td class="tblQmlPropNode"><p id="maximum-prop"> +<td class="tblQmlPropNode"><p> <span class="name">maximum</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> </table></div></div> <div class="qmldoc"><p>The maximum value of the <a href="qml-uicomponents-progressbar.html">ProgressBar</a> range. The <a href="qml-uicomponents-progressbar.html#value-prop">value</a> must not be more than this value.</p> @@ -63,7 +63,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="minimum-prop"> -<td class="tblQmlPropNode"><p id="minimum-prop"> +<td class="tblQmlPropNode"><p> <span class="name">minimum</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> </table></div></div> <div class="qmldoc"><p>The minimum value of the <a href="qml-uicomponents-progressbar.html">ProgressBar</a> range. The <a href="qml-uicomponents-progressbar.html#value-prop">value</a> must not be less than this value.</p> @@ -73,7 +73,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="secondColor-prop"> -<td class="tblQmlPropNode"><p id="secondColor-prop"> +<td class="tblQmlPropNode"><p> <span class="name">secondColor</span> : <span class="type">color</span></p></td></tr> </table></div></div> <div class="qmldoc"><p>The second color of the <a href="qml-uicomponents-progressbar.html">ProgressBar</a>'s gradient. Must bind to a color type.</p> @@ -84,7 +84,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="value-prop"> -<td class="tblQmlPropNode"><p id="value-prop"> +<td class="tblQmlPropNode"><p> <span class="name">value</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> </table></div></div> <div class="qmldoc"><p>The value of the progress.</p> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html index 18271cf77..b80835b63 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html @@ -26,11 +26,11 @@ </ul> <h2 id="properties">Properties</h2> <ul> -<li class="fn"><b><b><a href="qml-uicomponents-switch.html#on-prop">on</a></b></b> : bool</li> +<li class="fn"><b><a href="qml-uicomponents-switch.html#on-prop">on</a></b> : bool</li> </ul> <h2 id="methods">Methods</h2> <ul> -<li class="fn"><b><b><a href="qml-uicomponents-switch.html#toggle-method">toggle</a></b></b>()</li> +<li class="fn"><b><a href="qml-uicomponents-switch.html#toggle-method">toggle</a></b>()</li> </ul> <!-- $$$Switch-description --> <h2 id="details">Detailed Description</h2> @@ -43,7 +43,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="on-prop"> -<td class="tblQmlPropNode"><p id="on-prop"> +<td class="tblQmlPropNode"><p> <span class="name">on</span> : <span class="type">bool</span></p></td></tr> </table></div></div> <div class="qmldoc"><p>Indicates the state of the switch. If <code>false</code>, then the switch is in the <code>off</code> state.</p> @@ -54,7 +54,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="toggle-method"> -<td class="tblQmlFuncNode"><p id="toggle-method"> +<td class="tblQmlFuncNode"><p> <span class="name">toggle</span>()</p></td></tr> </table></div></div> <div class="qmldoc"><p>A method to toggle the switch. If the switch is <code>on</code>, the toggling it will turn it <code>off</code>. Toggling a switch in the <code>off</code> position will turn it <code>on</code>.</p> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html index 170bfa320..1b0f37f84 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html @@ -26,8 +26,8 @@ </ul> <h2 id="properties">Properties</h2> <ul> -<li class="fn"><b><b><a href="qml-uicomponents-tabwidget.html#current-prop">current</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-uicomponents-tabwidget.html#sampleReadOnlyProperty-prop">sampleReadOnlyProperty</a></b></b> : int</li> +<li class="fn"><b><a href="qml-uicomponents-tabwidget.html#current-prop">current</a></b> : int</li> +<li class="fn"><b><a href="qml-uicomponents-tabwidget.html#sampleReadOnlyProperty-prop">sampleReadOnlyProperty</a></b> : int</li> </ul> <!-- $$$TabWidget-description --> <h2 id="details">Detailed Description</h2> @@ -57,7 +57,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="current-prop"> -<td class="tblQmlPropNode"><p id="current-prop"> +<td class="tblQmlPropNode"><p> <span class="name">current</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> </table></div></div> <div class="qmldoc"><p>The currently active tab in the <a href="qml-uicomponents-tabwidget.html">TabWidget</a>.</p> @@ -67,7 +67,7 @@ <div class="qmlitem"><div class="qmlproto"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="sampleReadOnlyProperty-prop"> -<td class="tblQmlPropNode"><p id="sampleReadOnlyProperty-prop"> +<td class="tblQmlPropNode"><p> <span class="qmlextra">[read-only] </span><span class="name">sampleReadOnlyProperty</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> </table></div></div> <div class="qmldoc"><p>A sample <code>read-only</code> property. A contrived property to demonstrate QDoc's ability to detect read-only properties.</p> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-anotherchild-members.html b/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-anotherchild-members.html index 2919a7988..108db2ea7 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-anotherchild-members.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-anotherchild-members.html @@ -10,14 +10,14 @@ <h1 class="title">List of All Members for AnotherChild</h1> <p>This is the complete list of members for <a href="qml-qdoc-test-anotherchild.html">AnotherChild</a>, including inherited members.</p> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-anotherchild.html#name-prop">name</a></b></b> : string</li> +<li class="fn"><b><a href="qml-qdoc-test-anotherchild.html#name-prop">name</a></b> : string</li> </ul> <p>The following members are inherited from <a href="qml-qdoc-test-parent.html">Parent</a>.</p> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-parent.html#group-prop">group</a></b></b><ul> -<li class="fn"><b><b><a href="qml-qdoc-test-parent.html#group.a-prop">group.a</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-parent.html#group.b-prop">group.b</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-parent.html#group.c-prop">group.c</a></b></b> : int</li> +<li class="fn"><b><a href="qml-qdoc-test-parent.html#group-prop">group</a></b><ul> +<li class="fn"><b><a href="qml-qdoc-test-parent.html#group.a-prop">group.a</a></b> : int</li> +<li class="fn"><b><a href="qml-qdoc-test-parent.html#group.b-prop">group.b</a></b> : int</li> +<li class="fn"><b><a href="qml-qdoc-test-parent.html#group.c-prop">group.c</a></b> : int</li> </ul> </li> </ul> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-parent.html b/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-parent.html index 1d466cf6e..479ac12b0 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-parent.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-parent.html @@ -26,10 +26,10 @@ </ul> <h2 id="properties">Properties</h2> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-parent.html#group-prop">group</a></b></b><ul> -<li class="fn"><b><b><a href="qml-qdoc-test-parent.html#group.a-prop">group.a</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-parent.html#group.b-prop">group.b</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-parent.html#group.c-prop">group.c</a></b></b> : int</li> +<li class="fn"><b><a href="qml-qdoc-test-parent.html#group-prop">group</a></b><ul> +<li class="fn"><b><a href="qml-qdoc-test-parent.html#group.a-prop">group.a</a></b> : int</li> +<li class="fn"><b><a href="qml-qdoc-test-parent.html#group.b-prop">group.b</a></b> : int</li> +<li class="fn"><b><a href="qml-qdoc-test-parent.html#group.c-prop">group.c</a></b> : int</li> </ul> </li> </ul> @@ -42,13 +42,13 @@ <div class="table"><table class="qmlname"> <tr valign="top" class="even" id="group-prop"><th class="centerAlign"><p><b>group group</b></p></th></tr> <tr valign="top" class="odd" id="group.a-prop"> -<td class="tblQmlPropNode"><p id="group.a-prop"> +<td class="tblQmlPropNode"><p> <span class="name">group.a</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> <tr valign="top" class="odd" id="group.b-prop"> -<td class="tblQmlPropNode"><p id="group.b-prop"> +<td class="tblQmlPropNode"><p> <span class="qmlextra">[read-only] </span><span class="name">group.b</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> <tr valign="top" class="odd" id="group.c-prop"> -<td class="tblQmlPropNode"><p id="group.c-prop"> +<td class="tblQmlPropNode"><p> <span class="qmlextra">[since 2.0] </span><span class="name">group.c</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> </table></div></div> <div class="qmldoc"><p>Property group.</p> 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 7eba4bbe1..68fc28ac6 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html @@ -29,7 +29,8 @@ <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <Test></span> </td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENTS QDocTest REQUIRED) <br/> target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p> -</td></tr></table></div><ul> +</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">Deprecated members</a></li> </ul> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/second.html b/tests/auto/qdoc/generatedoutput/expected_output/second.html index 00111a128..b932dc7fa 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/second.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/second.html @@ -18,8 +18,7 @@ <h1 class="title">Second Class</h1> <div class="table"><table class="alignedsummary"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <Second></span> -</td></tr></table></div><ul> -</ul> +</td></tr></table></div> <!-- $$$Second-description --> <div class="descr"> <h2 id="details">Detailed Description</h2> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/space.html b/tests/auto/qdoc/generatedoutput/expected_output/space.html index 7c0e8e6ed..c84aae428 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/space.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/space.html @@ -21,8 +21,7 @@ <!-- @@@Space --> <div class="table"><table class="alignedsummary"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <Space></span> -</td></tr></table></div><ul> -</ul> +</td></tr></table></div> <h2 id="functions">Functions</h2> <div class="table"><table class="alignedsummary"> <tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="space.html#spaceFun">spaceFun</a></b>(Space::spacename <i>space</i>)</td></tr> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/bar.html b/tests/auto/qdoc/generatedoutput/expected_output/template/bar.html index f2f414c3c..88185435c 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/template/bar.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/template/bar.html @@ -23,8 +23,7 @@ <div class="table"><table class="alignedsummary"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <Bar></span> </td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENTS QDocTest REQUIRED) <br/> -target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div><ul> -</ul> +target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div> <!-- $$$Bar-description --> <div class="descr"> <h2 id="details">Detailed Description</h2> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/baz.html b/tests/auto/qdoc/generatedoutput/expected_output/template/baz.html index 415f780d8..482c5b02d 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/template/baz.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/template/baz.html @@ -23,8 +23,7 @@ <div class="table"><table class="alignedsummary"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <Baz></span> </td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENTS QDocTest REQUIRED) <br/> -target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div><ul> -</ul> +target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div> <!-- $$$Baz-description --> <div class="descr"> <h2 id="details">Detailed Description</h2> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/foo.html b/tests/auto/qdoc/generatedoutput/expected_output/template/foo.html index 171bd9484..84a7be7dd 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/template/foo.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/template/foo.html @@ -23,8 +23,7 @@ <div class="table"><table class="alignedsummary"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <Foo></span> </td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENTS QDocTest REQUIRED) <br/> -target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div><ul> -</ul> +target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div> <!-- $$$Foo-description --> <div class="descr"> <h2 id="details">Detailed Description</h2> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test-struct.html b/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test-struct.html index 62110d4df..1e4a40e2a 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test-struct.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test-struct.html @@ -20,8 +20,6 @@ <!-- $$$Struct-brief --> <p>Templated struct. <a href="#details">More...</a></p> <!-- @@@Struct --> -<ul> -</ul> <!-- $$$Struct-description --> <div class="descr"> <h2 id="details">Detailed Description</h2> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test.html b/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test.html index 8dd861760..51f9275fa 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test.html @@ -29,7 +29,8 @@ <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <Test></span> </td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENTS QDocTest REQUIRED) <br/> target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p> -</td></tr></table></div><ul> +</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">Deprecated members</a></li> </ul> @@ -62,6 +63,7 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr><tr><td class="me <h2 id="macros">Macros</h2> <div class="table"><table class="alignedsummary"> <tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#QDOCTEST_MACRO2">QDOCTEST_MACRO2</a></b>(int &<i>x</i>)</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#Q_INVOKABLE">Q_INVOKABLE</a></b></td></tr> </table></div> <!-- $$$Test-description --> <div class="descr"> @@ -132,6 +134,10 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr><tr><td class="me <p>A macro with argument <i>x</i>.</p> <p>This function was introduced in Test 1.1.</p> <!-- @@@QDOCTEST_MACRO2 --> +<!-- $$$Q_INVOKABLE[overload1]$$$Q_INVOKABLE --> +<h3 class="fn" id="Q_INVOKABLE"><span class="name">Q_INVOKABLE</span></h3> +<p>This is a mock Q_INVOKABLE for the purpose of ensuring QDoc autolink to it as expected.</p> +<!-- @@@Q_INVOKABLE --> </div> </body> </html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-vec.html b/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-vec.html index e38e0fc0a..fc0003335 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-vec.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-vec.html @@ -23,8 +23,7 @@ <div class="table"><table class="alignedsummary"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <Vec></span> </td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENTS QDocTest REQUIRED) <br/> -target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div><ul> -</ul> +target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div> <!-- $$$Vec-description --> <div class="descr"> <h2 id="details">Detailed Description</h2> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html index 5e405a7ca..a160f568f 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html @@ -29,7 +29,8 @@ <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <Test></span> </td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENTS QDocTest REQUIRED) <br/> target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p> -</td></tr></table></div><ul> +</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">Deprecated members</a></li> </ul> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html index 2626faa32..813e00f55 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html @@ -25,7 +25,8 @@ <div class="table"><table class="alignedsummary"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <TestDerived></span> </td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENTS QDocTest REQUIRED) <br/> -target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherits:</td><td class="memItemRight bottomAlign"> <a href="testqdoc-test.html">TestQDoc::Test</a></td></tr></table></div><ul> +target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherits:</td><td class="memItemRight bottomAlign"> <a href="testqdoc-test.html">TestQDoc::Test</a></td></tr></table></div> +<ul> <li><a href="testqdoc-testderived-members.html">List of all members, including inherited members</a></li> <li><a href="testqdoc-testderived-obsolete.html">Deprecated members</a></li> </ul> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html index e78deeb99..289712177 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html @@ -24,8 +24,7 @@ <div class="table"><table class="alignedsummary"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <TestCPP></span> </td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENTS QDocTest REQUIRED) <br/> -target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div><ul> -</ul> +target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div> <h2 id="classes">Classes</h2> <div class="table"><table class="alignedsummary"> <tr><td class="memItemLeft rightAlign topAlign"> class </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html">Test</a></b></td></tr> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/third.html b/tests/auto/qdoc/generatedoutput/expected_output/third.html index 9b7ce4b37..3ca46d463 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/third.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/third.html @@ -18,8 +18,7 @@ <h1 class="title">Third Class</h1> <div class="table"><table class="alignedsummary"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <Third></span> -</td></tr></table></div><ul> -</ul> +</td></tr></table></div> <!-- $$$Third-description --> <div class="descr"> <h2 id="details">Detailed Description</h2> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/toc.html b/tests/auto/qdoc/generatedoutput/expected_output/toc.html index dafd47fd8..f34ce0db6 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/toc.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/toc.html @@ -10,7 +10,7 @@ <link rel="prev" href="qdoctests-qdocfileoutput-linking.html" /> <p class="naviNextPrevious headerNavi"> <a class="prevPage" href="qdoctests-qdocfileoutput-linking.html">QDoc Linking Test</a> -</p><p/> +</p> <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> <h1 class="title">Table of Contents</h1> <!-- $$$toc.html-description --> diff --git a/tests/auto/qdoc/generatedoutput/testdata/crossmodule/crossmodule.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/crossmodule/crossmodule.qdocconf index 359063f34..1c16d66f8 100644 --- a/tests/auto/qdoc/generatedoutput/testdata/crossmodule/crossmodule.qdocconf +++ b/tests/auto/qdoc/generatedoutput/testdata/crossmodule/crossmodule.qdocconf @@ -9,3 +9,5 @@ sources = testtype.cpp HTML.nosubdirs = true HTML.outputsubdir = crossmodule + +defines += test_crossmodule diff --git a/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp b/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp index 087a75e27..f6f468818 100644 --- a/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp +++ b/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp @@ -285,4 +285,17 @@ void TestDerived::staticObsoleteMember() \nothing \endif */ + +/*! +\if defined(test_template) + \macro Q_INVOKABLE + \relates TestQDoc::Test + + This is a mock Q_INVOKABLE for the purpose of ensuring QDoc autolink to it + as expected. +\else + \nothing +\endif +*/ + } // namespace TestQDoc diff --git a/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.h b/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.h index e8a294120..51a9534da 100644 --- a/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.h +++ b/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.h @@ -47,6 +47,10 @@ template<typename T> using Specialized = Struct<int, T>; #endif +#ifdef test_template +# define Q_INVOKABLE void foo() {}; +#endif + #ifdef test_scopedenum enum ClassicEnum { Yee, Haw, Howdy, Partner }; |