diff options
Diffstat (limited to 'tests/auto/qdoc/generatedoutput/expected_output')
121 files changed, 0 insertions, 7221 deletions
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/autolinking.html b/tests/auto/qdoc/generatedoutput/expected_output/autolinking.html deleted file mode 100644 index b86a94d61..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/autolinking.html +++ /dev/null @@ -1,34 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- classlists.qdoc --> - <title>Autolinking | TestCPP</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#testqdoc">TestQDoc</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Autolinking</h1> -<!-- $$$autolinking.html-description --> -<div class="descr" id="details"> -<h2 id="testqdoc">TestQDoc</h2> -<p>The string <a href="testqdoc.html">TestQDoc</a> links to the C++ namespace unless linking explicitly, <a href="autolinking.html#testqdoc">like this</a>, or <a href="autolinking.html#testqdoc">this</a>. Also,</p> -<p>Autolinks:</p> -<ul> -<li><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></li> -</ul> -<p>Explicit links:</p> -<ul> -<li><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></li> -<li><a href="obsolete-classes.html#testqdoc">Obsolete Classes#TestQDoc</a></li> -</ul> -</div> -<!-- @@@autolinking.html --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/all-namespaces.html b/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/all-namespaces.html deleted file mode 100644 index 8f665610e..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/all-namespaces.html +++ /dev/null @@ -1,20 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- namespaces.qdoc --> - <title>Namespaces | CrossModule</title> -</head> -<body> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Namespaces</h1> -<!-- $$$all-namespaces.html-description --> -<div class="descr" id="details"> -<div class="table"><table class="annotated"> -<tr class="odd topAlign"><td class="tblName"><p><a href="crossmoduleref.html">CrossModuleRef</a></p></td><td class="tblDescr"><p>Namespace that has documented functions in multiple modules</p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="testqdoc.html">TestQDoc</a></p></td><td class="tblDescr"><p>A namespace</p></td></tr> -</table></div> -</div> -<!-- @@@all-namespaces.html --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/crossmoduleref-sub-crossmodule.html b/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/crossmoduleref-sub-crossmodule.html deleted file mode 100644 index 206a28dfe..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/crossmoduleref-sub-crossmodule.html +++ /dev/null @@ -1,30 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> - <title>CrossModuleRef Namespace | CrossModule</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#functions">Functions</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">CrossModuleRef Namespace</h1> -<p>The CrossModuleRef namespace includes the following elements from module CrossModule. The full namespace is documented in module TestCPP<a href="crossmoduleref.html"> here.</a></p> -<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="crossmoduleref-sub-crossmodule.html#documentMeToo">documentMeToo</a></b>()</td></tr> -</table></div> -<div class="func"> -<h2>Function Documentation</h2> -<!-- $$$documentMeToo[overload1]$$$documentMeToo --> -<h3 class="fn" id="documentMeToo"><span class="type">void</span> CrossModuleRef::<span class="name">documentMeToo</span>()</h3> -<p>Function under a namespace that's documented elsewhere.</p> -<!-- @@@documentMeToo --> -</div> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype-members.html b/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype-members.html deleted file mode 100644 index 0a32e4e60..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype-members.html +++ /dev/null @@ -1,28 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testtype.cpp --> - <title>List of All Members for TestType | CrossModule</title> -</head> -<body> -<li>TestType</li> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">List of All Members for TestType</h1> -<p>This is the complete list of members for <a href="testtype.html">TestType</a>, including inherited members.</p> -<ul> -<li class="fn"><span class="name"><b><a href="testqdoc-testderived.html#DerivedType-typedef">DerivedType</a></b></span></li> -<li class="fn"><span class="name"><b><a href="testqdoc-testderived.html#NotTypedef-typedef">NotTypedef</a></b></span></li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#SomeType-typedef">SomeType</a></b></span></li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#operator-eq">operator=</a></b></span>(TestQDoc::Test &&) : TestQDoc::Test &</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#funcPtr">funcPtr</a></b></span>(bool, const char *) : void (*)(bool)</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#inlineFunction">inlineFunction</a></b></span>()</li> -<li class="fn"><span class="name"><b><a href="testtype.html#nothing">nothing</a></b></span>()</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#overload">overload</a></b></span>()</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#overload-1">overload</a></b></span>(bool)</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#someFunction">someFunction</a></b></span>(int, int) : int</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#someFunctionDefaultArg">someFunctionDefaultArg</a></b></span>(int, bool)</li> -<li class="fn"><span class="name"><b><a href="testqdoc-testderived.html#virtualFun">virtualFun</a></b></span>()</li> -</ul> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype.html b/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype.html deleted file mode 100644 index 5db714b9b..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype.html +++ /dev/null @@ -1,64 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testtype.cpp --> - <title>TestType Class | CrossModule</title> -</head> -<body> -<li>TestType</li> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#public-functions">Public Functions</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -<li class="level2"><a href="#linking">Linking</a></li> -<li class="level2"><a href="#generated-lists">Generated Lists</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">TestType Class</h1> -<!-- $$$TestType-brief --> -<p>A class inheriting another class that lives in an external doc module. <a href="#details">More...</a></p> -<!-- @@@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> -<li><a href="testtype-members.html">List of all members, including inherited members</a></li> -</ul> -<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="testtype.html#nothing">nothing</a></b>()</td></tr> -</table></div> -<!-- $$$TestType-description --> -<div class="descr"> -<h2 id="details">Detailed Description</h2> -<h3 id="linking">Linking</h3> -<p>These links go to the parent class:</p> -<ul> -<li><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></li> -<li><a href="testqdoc-test.html">Test</a> class <a href="testqdoc.html#usage">Usage</a>.</li> -<li><a href="testqdoc.html#QDOCTEST_MACRO">QDOCTEST_MACRO</a></li> -<li>DontLinkToMe</li> -</ul> -<h3 id="generated-lists">Generated Lists</h3> -<p>This is an annotated list of entries in a group: <div class="table"><table class="annotated"> -<tr class="odd topAlign"><td class="tblName"><p><a href="testqdoc-test.html">TestQDoc::Test</a></p></td><td class="tblDescr"><p>A class in a namespace</p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="testqdoc-test.html#QDOCTEST_MACRO2">TestQDoc::Test::QDOCTEST_MACRO2</a></p></td><td class="tblDescr"><p>A macro with argument x</p></td></tr> -<tr class="odd topAlign"><td class="tblName"><p><a href="testqdoc-test.html#someFunctionDefaultArg">TestQDoc::Test::someFunctionDefaultArg()</a></p></td></tr> -</table></div> -</p> -</div> -<p><b>See also </b><a href="testqdoc-test.html#someFunction">someFunction</a>().</p> -<!-- @@@TestType --> -<div class="func"> -<h2>Member Function Documentation</h2> -<!-- $$$nothing[overload1]$$$nothing --> -<h3 class="fn" id="nothing"><span class="type">void</span> TestType::<span class="name">nothing</span>()</h3> -<p>Nothing to see here.</p> -<!-- @@@nothing --> -</div> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/crossmoduleref.html b/tests/auto/qdoc/generatedoutput/expected_output/crossmoduleref.html deleted file mode 100644 index fc117c48f..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/crossmoduleref.html +++ /dev/null @@ -1,44 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testcpp.cpp --> - <title>CrossModuleRef Namespace | TestCPP</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#functions">Functions</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">CrossModuleRef Namespace</h1> -<!-- $$$CrossModuleRef-brief --> -<p>Namespace that has documented functions in multiple modules. <a href="#details">More...</a></p> -<!-- @@@CrossModuleRef --> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <CrossModuleRef></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> -<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="crossmoduleref.html#documentMe">documentMe</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="crossmoduleref-sub-crossmodule.html#documentMeToo">documentMeToo</a></b>()</td></tr> -</table></div> -<!-- $$$CrossModuleRef-description --> -<div class="descr"> -<h2 id="details">Detailed Description</h2> -</div> -<!-- @@@CrossModuleRef --> -<div class="func"> -<h2>Function Documentation</h2> -<!-- $$$documentMe[overload1]$$$documentMe --> -<h3 class="fn" id="documentMe"><span class="type">void</span> CrossModuleRef::<span class="name">documentMe</span>()</h3> -<p>Document me!</p> -<!-- @@@documentMe --> -</div> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/demos-manifest.xml b/tests/auto/qdoc/generatedoutput/expected_output/demos-manifest.xml deleted file mode 100644 index 60da1bca7..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/demos-manifest.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<instructionals module="Test"> - <demos> - <demo docUrl="qthelp://org.qt-project.test.001/test/test-demos-demo-example.html" imageUrl="qthelp://org.qt-project.test.001/test/images/leonardo-da-vinci.png" isTest="true" name="Demo" projectPath="test/demos/demo/demo.pro"> - <description><![CDATA[No description available]]></description> - <tags>demo,test</tags> - </demo> - </demos> -</instructionals> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoc-test-qmlmodule.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoc-test-qmlmodule.xml deleted file mode 100644 index 340a83f53..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoc-test-qmlmodule.xml +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>QDoc.Test QML Module</db:title> -<db:productname>Test</db:productname> -<db:titleabbrev>A test project for QDoc build artifacts</db:titleabbrev> -<db:abstract> -<db:para>QML Types for the Test module.</db:para> -<db:para><db:emphasis role="bold">This module is under development and is subject to change.</db:emphasis></db:para> -<db:para>This module was introduced in Qt 1.1.</db:para> -</db:abstract> -</db:info> -<db:para><db:emphasis role="bold">This module is under development and is subject to change.</db:emphasis></db:para> -<db:para>This module was introduced in Qt 1.1.</db:para> -<db:anchor xml:id="details"/> -<db:variablelist role="members"> -<db:varlistentry> -<db:term><db:link xlink:href="qml-qdoc-test-doctest.xml" xlink:role="">DocTest</db:link></db:term> -<db:listitem> -<db:para>Represents a doc test case.</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term><db:link xlink:href="qml-qdoc-test-abstractparent.xml" xlink:role="">AbstractParent</db:link></db:term> -<db:listitem> -<db:para>Abstract base QML type.</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term><db:link xlink:href="qml-qdoc-test-child.xml" xlink:role="">Child</db:link></db:term> -<db:listitem> -<db:para>A Child inheriting its parent.</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term><db:link xlink:href="qml-int.xml" xlink:role="">int</db:link></db:term> -<db:listitem> -<db:para>An integer basic type.</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term><db:link xlink:href="qml-qdoc-test-yetanotherchild.xml" xlink:role="">YetAnotherChild</db:link></db:term> -<db:listitem> -<db:para>A type inheriting from internal abstract parent.</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term><db:link xlink:href="qml-qdoc-test-type.xml" xlink:role="">Type</db:link></db:term> -<db:listitem> -<db:para>A QML type documented in a .cpp file.</db:para> -</db:listitem> -</db:varlistentry> -</db:variablelist> -</db:article> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput-exhaustive.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput-exhaustive.xml deleted file mode 100644 index 7d9ed16f0..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput-exhaustive.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>Exhaustive testing of QDoc commands</db:title> -<db:productname>OutputFromQDocFiles</db:productname> -<db:edition>OutputFromQDocFiles - A test project for QDoc build artifacts</db:edition> -<db:titleabbrev>A test project for QDoc build artifacts</db:titleabbrev> -<db:abstract> -<db:para>This page is a dumping ground for QDoc commands under test.</db:para> -</db:abstract> -</db:info> -<db:section xml:id="this-is-a-section1"> -<db:title>This is a section1</db:title> -<db:section xml:id="this-is-a-section2"> -<db:title>This is a section2</db:title> -<db:section xml:id="this-is-a-section3"> -<db:title>This is a section3</db:title> -<db:section xml:id="this-is-a-section4"> -<db:title>This is a section4</db:title> -<db:programlisting language="cpp" role="bad">This is bad code -</db:programlisting> -<db:para>This text should have a line break riiiiight noooow.</db:para> -<db:para><db:emphasis role="bold">All your text belong to bold</db:emphasis> ...And this is an examble of only <db:emphasis role="bold">bold</db:emphasis> being, well, bold.</db:para> -<db:programlisting language="cpp"> ... -</db:programlisting> -<db:programlisting language="js"><@comment>// If I knew JavaScript, this is where I would write it.</@comment> -</db:programlisting> -<db:para>And if I knew qmltext, I guess this is where that would go. </db:para> -<db:title>This a caption</db:title> -<db:para>Lorem legal ipsum</db:para> -<db:blockquote><db:para>This is a quotation.</db:para> -</db:blockquote> - <html><body>This is <b>raw</b>. Like the <h1>Eddie Murphy</h1> movie. Just not as funny.</body></html> - <db:sidebar><db:para>Look, ma! I made a sidebar!</db:para> -</db:sidebar> -<db:informaltable style="generic"> -<db:tr valign="top"> -<db:td> -<db:para>Table item in a table row</db:para> -</db:td> -</db:tr> -<db:tr valign="top"> -<db:td> -<db:para>Another item in a different row</db:para> -</db:td> -</db:tr> -</db:informaltable> -<db:important> -<db:para>This is really important.</db:para> -</db:important> -<db:para>For example, if you have code like</db:para> -<db:programlisting language="cpp" role="bad">This is old code<@op>.</@op> -</db:programlisting> -<db:para>you can rewrite it as</db:para> -<db:programlisting language="cpp" role="new">This is <@keyword>new</@keyword> and shiny<@op>!</@op> -</db:programlisting> -<db:note> -<db:para>The code above doesn't compile</db:para> -</db:note> -<db:warning> -<db:para>The following commands have yet to be tested: footnote link sincelist header index topicref // or just don’t care, remove it image inlineimage printline printto printuntil // what’s the difference between printto and printuntil??? quotefile quotefromfile quotefunction skipline skipto skipuntil span snippet codeline overload sub sup tableofcontents tt uicontrol endmapref endomit underline unicode</db:para> -</db:warning> -</db:section> -</db:section> -</db:section> -</db:section> -</db:article> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput-linking.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput-linking.xml deleted file mode 100644 index 90c76d8ee..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput-linking.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>Testing QDoc's link command</db:title> -<db:productname>OutputFromQDocFiles</db:productname> -<db:edition>OutputFromQDocFiles - A test project for QDoc build artifacts</db:edition> -<db:titleabbrev>A test project for QDoc build artifacts</db:titleabbrev> -<db:extendedlink><db:link xlink:to="qdoctests-qdocfileoutput.xml" xlink:title="prev" xlink:label="QDoc Testing"/></db:extendedlink><db:extendedlink><db:link xlink:to="toc.xml" xlink:title="prev" xlink:label="Table of Contents"/></db:extendedlink><db:abstract> -<db:para>This is a page for testing QDoc's link command.</db:para> -</db:abstract> -</db:info> -<db:anchor xml:id="link-test-target"/> -<db:section xml:id="link-targets"> -<db:title>Link targets</db:title> -<db:para>Valid parameters for the link command (<db:code>\l</db:code>) are page and section titles, targets defined with \target or \keyword commands, and API reference keywords (types, methods, namespaces, and so on).</db:para> -</db:section> -</db:article> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput.xml deleted file mode 100644 index 1e230d3b7..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>Testing QDoc output from .qdoc files</db:title> -<db:productname>OutputFromQDocFiles</db:productname> -<db:edition>OutputFromQDocFiles - A test project for QDoc build artifacts</db:edition> -<db:titleabbrev>A test project for QDoc build artifacts</db:titleabbrev> -<db:extendedlink><db:link xlink:to="qdoctests-qdocfileoutput-linking.xml" xlink:title="prev" xlink:label="QDoc Linking Test"/></db:extendedlink><db:abstract> -<db:para>This is a simple page for testing purposes only.</db:para> -</db:abstract> -</db:info> -<db:para>QDoc generates documentation for software projects. It does this by extracting <db:emphasis>QDoc comments</db:emphasis> from project source files. QDoc comments are signified by a C-style-like comment tag followed by an exclamation point, like this: <db:code>/*!</db:code> <db:code>This text is contained within QDoc comment tags.</db:code> <db:code>*/</db:code>.</db:para> -<db:section xml:id="supported-file-types"> -<db:title>Supported file types</db:title> -<db:para>QDoc parses <db:code>.cpp</db:code> and <db:code>.qdoc</db:code> files. It does extract comments from header (<db:code>.h</db:code>) files.</db:para> -</db:section> -<db:section xml:id="further-information"> -<db:title>Further information</db:title> -<db:para>This test document is written with the purpose of testing the output QDoc generates when parsing <db:code>.qdoc</db:code> files. It is fairly simple and makes use of a limited subset of QDoc's command. Those commands are:</db:para> -<db:itemizedlist> -<db:listitem> -<db:para><db:code>\page</db:code></db:para> -</db:listitem> -<db:listitem> -<db:para><db:code>\title</db:code></db:para> -</db:listitem> -<db:listitem> -<db:para><db:code>\brief</db:code></db:para> -</db:listitem> -<db:listitem> -<db:para><db:code>\e</db:code> (for emphasizing "QDoc comments")</db:para> -</db:listitem> -<db:listitem> -<db:para><db:code>\c</db:code> (for multiple monospace-formatted entries)</db:para> -</db:listitem> -<db:listitem> -<db:para><db:code>\section1</db:code></db:para> -</db:listitem> -<db:listitem> -<db:para><db:code>\list</db:code></db:para> -</db:listitem> -<db:listitem> -<db:para><db:code>\li</db:code></db:para> -</db:listitem> -<db:listitem> -<db:para><db:code>\endlist</db:code></db:para> -</db:listitem> -</db:itemizedlist> -</db:section> -<db:section xml:id="linking"> -<db:title>Linking</db:title> -<db:para>There are multiple ways to create hyperlinks to other topics:</db:para> -<db:itemizedlist> -<db:listitem> -<db:para><db:link xlink:href="qdoctests-qdocfileoutput-linking.xml">Linking to a page title</db:link></db:para> -</db:listitem> -<db:listitem> -<db:para><db:link xlink:href="qdoctests-qdocfileoutput-linking.xml#link-targets">Linking to a section title</db:link></db:para> -</db:listitem> -<db:listitem> -<db:para><db:link xlink:href="qdoctests-qdocfileoutput-linking.xml#link-test-target">Linking using a \target string</db:link></db:para> -</db:listitem> -<db:listitem> -<db:para><db:link xlink:href="qdoctests-qdocfileoutput-linking.xml">Linking using a \keyword string</db:link></db:para> -</db:listitem> -</db:itemizedlist> -</db:section> -</db:article> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-int.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-int.xml deleted file mode 100644 index 00ef9ec39..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-int.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>int QML Basic Type</db:title> -<db:productname>Test</db:productname> -<db:titleabbrev>A test project for QDoc build artifacts</db:titleabbrev> -<db:abstract> -<db:para>An integer basic type.</db:para> -</db:abstract> -</db:info> -<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/docbook/qml-qdoc-test-abstractparent.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-abstractparent.xml deleted file mode 100644 index 9278f7d7e..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-abstractparent.xml +++ /dev/null @@ -1,72 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>AbstractParent QML Type</db:title> -<db:productname>Test</db:productname> -<db:titleabbrev>A test project for QDoc build artifacts</db:titleabbrev> -<db:abstract> -<db:para>Abstract base QML type.</db:para> -</db:abstract> -</db:info> -<db:variablelist> -<db:varlistentry> -<db:term>Import Statement</db:term> -<db:listitem> -<db:para>import QDoc.Test 1.1</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term>Inherited By:</db:term> -<db:listitem> -<db:para><db:link xlink:href="qml-qdoc-test-child.xml" xlink:role="">Child</db:link></db:para> -</db:listitem> -</db:varlistentry> -</db:variablelist> -<db:section xml:id="details"> -<db:title>Detailed Description</db:title> -</db:section> -<db:section xml:id="property-documentation"> -<db:title>Property Documentation</db:title> -<db:section xml:id="children-prop"> -<db:title>[default] children : list<Child></db:title> -<db:fieldsynopsis> -<db:type>list<Child></db:type> -<db:varname>children</db:varname> -<db:modifier>writable</db:modifier> -<db:modifier>[default]</db:modifier> - -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:fieldsynopsis> -<db:para>Children of the type.</db:para> -</db:section> -<db:section xml:id="name-prop"> -<db:title>name : string</db:title> -<db:fieldsynopsis> -<db:type>string</db:type> -<db:varname>name</db:varname> -<db:modifier>writable</db:modifier> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:fieldsynopsis> -<db:para>Name of this parent.</db:para> -</db:section> -</db:section> -<db:section xml:id="method-documentation"> -<db:title>Method Documentation</db:title> -<db:section xml:id="name-method-1"> -<db:title>void name()</db:title> -<db:para>Name all children with random names.</db:para> -</db:section> -<db:section xml:id="name-method"> -<db:title>void name(Child <db:emphasis>child</db:emphasis>, <db:emphasis>name</db:emphasis>)</db:title> -<db:para>Name a <db:code role="parameter">child</db:code> using <db:code role="parameter">name</db:code>.</db:para> -</db:section> -<db:section xml:id="rear-method"> -<db:title>void rear(Child <db:emphasis>child</db:emphasis>, var <db:emphasis>method</db:emphasis> = Strict)</db:title> -<db:para>Do some abstract parenting on <db:code role="parameter">child</db:code> using a specific <db:code role="parameter">method</db:code>.</db:para> -</db:section> -</db:section> -</db:article> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-child.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-child.xml deleted file mode 100644 index 56dea87f8..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-child.xml +++ /dev/null @@ -1,72 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>Child QML Type</db:title> -<db:productname>Test</db:productname> -<db:titleabbrev>A test project for QDoc build artifacts</db:titleabbrev> -<db:abstract> -<db:para>A Child inheriting its parent.</db:para> -</db:abstract> -</db:info> -<db:variablelist> -<db:varlistentry> -<db:term>Import Statement</db:term> -<db:listitem> -<db:para>import QDoc.Test 1.1</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term>Inherits:</db:term> -<db:listitem> -<db:para><db:link xlink:href="">AbstractParent</db:link></db:para> -</db:listitem> -</db:varlistentry> -</db:variablelist> -<db:section xml:id="details"> -<db:title>Detailed Description</db:title> -</db:section> -<db:section xml:id="property-documentation"> -<db:title>Property Documentation</db:title> -<db:section xml:id="children-prop"> -<db:title>[default] children : list<Child></db:title> -<db:fieldsynopsis> -<db:type>list<Child></db:type> -<db:varname>children</db:varname> -<db:modifier>writable</db:modifier> -<db:modifier>[default]</db:modifier> - -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:fieldsynopsis> -<db:para>Children of the type.</db:para> -</db:section> -<db:section xml:id="name-prop"> -<db:title>name : string</db:title> -<db:fieldsynopsis> -<db:type>string</db:type> -<db:varname>name</db:varname> -<db:modifier>writable</db:modifier> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:fieldsynopsis> -<db:para>Name of this child.</db:para> -</db:section> -</db:section> -<db:section xml:id="method-documentation"> -<db:title>Method Documentation</db:title> -<db:section xml:id="name-method-1"> -<db:title>void name()</db:title> -<db:para>Name all children with random names.</db:para> -</db:section> -<db:section xml:id="name-method"> -<db:title>void name(Child <db:emphasis>child</db:emphasis>, <db:emphasis>name</db:emphasis>)</db:title> -<db:para>Name a <db:code role="parameter">child</db:code> of this child using <db:code role="parameter">name</db:code>.</db:para> -</db:section> -<db:section xml:id="rear-method"> -<db:title>void rear(Child <db:emphasis>child</db:emphasis>, var <db:emphasis>method</db:emphasis> = Strict)</db:title> -<db:para>Do some abstract parenting on <db:code role="parameter">child</db:code> using a specific <db:code role="parameter">method</db:code>.</db:para> -</db:section> -</db:section> -</db:article> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-doctest.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-doctest.xml deleted file mode 100644 index db4ba4bfe..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-doctest.xml +++ /dev/null @@ -1,112 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>DocTest QML Type</db:title> -<db:productname>Test</db:productname> -<db:titleabbrev>A test project for QDoc build artifacts</db:titleabbrev> -<db:abstract> -<db:para>Represents a doc test case.</db:para> -<db:para>This type was introduced in QDoc.Test 0.9.</db:para> -</db:abstract> -</db:info> -<db:variablelist> -<db:varlistentry> -<db:term>Import Statement</db:term> -<db:listitem> -<db:para>import QDoc.Test 1.1</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term>Since:</db:term> -<db:listitem> -<db:para>QDoc.Test 0.9</db:para> -</db:listitem> -</db:varlistentry> -</db:variablelist> -<db:section xml:id="details"> -<db:title>Detailed Description</db:title> -<db:section xml:id="introduction"> -<db:title>Introduction</db:title> -<db:para>A documentation test case, itself documented inline in <db:link xlink:href="qml-qdoc-test-doctest.xml">DocTest</db:link>.qml.</db:para> -</db:section> -</db:section> -<db:section xml:id="property-documentation"> -<db:title>Property Documentation</db:title> -<db:section xml:id="active-prop"> -<db:title>[default: true] active : bool</db:title> -<db:fieldsynopsis> -<db:type>bool</db:type> -<db:varname>active</db:varname> -<db:modifier>writable</db:modifier> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:fieldsynopsis> -<db:para>Whether the test is active.</db:para> -<db:para><db:emphasis>See also </db:emphasis> -<db:simplelist type="vert" role="see-also"><db:member><db:link xlink:href="qml-qdoc-test-doctest.xml#name-prop">name</db:link></db:member> -</db:simplelist> -</db:para></db:section> -<db:section xml:id="name-prop"> -<db:title>[required] name : string</db:title> -<db:fieldsynopsis> -<db:type>string</db:type> -<db:varname>name</db:varname> -<db:modifier>writable</db:modifier> -<db:modifier>required</db:modifier> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:fieldsynopsis> -<db:para>Name of the test.</db:para> -<db:programlisting language="qml"><@type>DocTest</@type> { - <@name>name</@name>: <@string>&quot;test&quot;</@string> - <@comment>// ...</@comment> -} -</db:programlisting> -</db:section> -</db:section> -<db:section xml:id="signal-documentation"> -<db:title>Signal Documentation</db:title> -<db:section xml:id="completed-signal"> -<db:title>completed()</db:title> -<db:note> -<db:para>The corresponding handler is <db:code>onCompleted</db:code>.</db:para> -</db:note> -</db:section> -<db:section xml:id="foo-signal"> -<db:title>foo(var <db:emphasis>bar</db:emphasis>)</db:title> -<db:para>Signal with parameter <db:code role="parameter">bar</db:code>.</db:para> -<db:note> -<db:para>The corresponding handler is <db:code>onFoo</db:code>.</db:para> -</db:note> -</db:section> -<db:section xml:id="itsHappening-signal"> -<db:title>itsHappening(bool <db:emphasis>really</db:emphasis>)</db:title> -<db:para>Signals that something is <db:code role="parameter">really</db:code> happening.</db:para> -<db:note> -<db:para>The corresponding handler is <db:code>onItsHappening</db:code>.</db:para> -</db:note> -</db:section> -</db:section> -<db:section xml:id="method-documentation"> -<db:title>Method Documentation</db:title> -<db:section xml:id="fail-method"> -<db:title>[since QDoc.Test 1.0] fail(<db:emphasis>message</db:emphasis> = "oops")</db:title> -<db:para>Fails the current test case, with the optional <db:code role="parameter">message</db:code>.</db:para> -<db:para>This method was introduced in QDoc.Test 1.0.</db:para> -</db:section> -<db:section xml:id="fail_hard-method"> -<db:title>fail_hard(<db:emphasis>msg</db:emphasis> = "facepalm", <db:emphasis>option</db:emphasis> = 123)</db:title> -<db:para>Fails the current test case, hard.</db:para> -<db:itemizedlist> -<db:listitem> -<db:para>Prints out <db:code role="parameter">msg</db:code>.</db:para> -</db:listitem> -<db:listitem> -<db:para>Accepts a random <db:code role="parameter">option</db:code>.</db:para> -</db:listitem> -</db:itemizedlist> -</db:section> -</db:section> -</db:article> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-type.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-type.xml deleted file mode 100644 index 62bdb9e79..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-type.xml +++ /dev/null @@ -1,175 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>Type QML Type</db:title> -<db:productname>Test</db:productname> -<db:titleabbrev>A test project for QDoc build artifacts</db:titleabbrev> -<db:abstract> -<db:para>A QML type documented in a .cpp file.</db:para> -</db:abstract> -</db:info> -<db:variablelist> -<db:varlistentry> -<db:term>Import Statement</db:term> -<db:listitem> -<db:para>import QDoc.Test 1.1</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term>Instantiates:</db:term> -<db:listitem> -<db:para><db:link xlink:href="testqdoc-test.xml">Test</db:link></db:para> -</db:listitem> -</db:varlistentry> -</db:variablelist> -<db:section xml:id="details"> -<db:title>Detailed Description</db:title> -</db:section> -<db:section xml:id="property-documentation"> -<db:title>Property Documentation</db:title> -<db:para>A group of properties sharing a documentation comment.</db:para> -<db:section xml:id="group-prop"> -<db:title>group group</db:title> -<db:bridgehead renderas="sect2" xml:id="group.first-prop">group.first : int</db:bridgehead> -<db:fieldsynopsis> -<db:type>int</db:type> -<db:varname>group.first</db:varname> -<db:modifier>writable</db:modifier> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:fieldsynopsis> -<db:bridgehead renderas="sect2" xml:id="group.second-prop">group.second : int</db:bridgehead> -<db:fieldsynopsis> -<db:type>int</db:type> -<db:varname>group.second</db:varname> -<db:modifier>writable</db:modifier> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:fieldsynopsis> -<db:bridgehead renderas="sect2" xml:id="group.third-prop">group.third : int</db:bridgehead> -<db:fieldsynopsis> -<db:type>int</db:type> -<db:varname>group.third</db:varname> -<db:modifier>writable</db:modifier> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:fieldsynopsis> -<db:para>A property group.</db:para> -</db:section> -<db:section xml:id="id-prop"> -<db:title>[read-only] id : int</db:title> -<db:fieldsynopsis> -<db:type>int</db:type> -<db:varname>id</db:varname> -<db:modifier>[read-only]</db:modifier> - -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:fieldsynopsis> -<db:para>A read-only property.</db:para> -</db:section> -<db:section xml:id="name-prop"> -<db:title>[required] name : string</db:title> -<db:fieldsynopsis> -<db:type>string</db:type> -<db:varname>name</db:varname> -<db:modifier>writable</db:modifier> -<db:modifier>required</db:modifier> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:fieldsynopsis> -<db:para>Name of the Test.</db:para> -</db:section> -</db:section> -<db:section xml:id="attached-property-documentation"> -<db:title>Attached Property Documentation</db:title> -<db:section xml:id="type-attached-prop"> -<db:title>[default: Type.NoType] Type.type : enumeration</db:title> -<db:fieldsynopsis> -<db:type>enumeration</db:type> -<db:varname>Type.type</db:varname> -<db:modifier>attached</db:modifier> -<db:modifier>writable</db:modifier> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:fieldsynopsis> -<db:informaltable> -<db:thead> -<db:tr> -<db:th>Constant</db:th> -<db:th>Description</db:th> -</db:tr> -</db:thead> -<db:tr> -<db:td> -<db:para>Type.NoType</db:para> -</db:td> -<db:td> -<db:para>Nothing</db:para> -</db:td> -</db:tr> -<db:tr> -<db:td> -<db:para>Type.SomeType</db:para> -</db:td> -<db:td> -<db:para>Something</db:para> -</db:td> -</db:tr> -</db:informaltable> -</db:section> -</db:section> -<db:section xml:id="signal-documentation"> -<db:title>Signal Documentation</db:title> -<db:section xml:id="completed-signal"> -<db:title>completed(int <db:emphasis>status</db:emphasis>)</db:title> -<db:para>This signal is emitted when the operation completed with <db:code role="parameter">status</db:code>.</db:para> -<db:note> -<db:para>The corresponding handler is <db:code>onCompleted</db:code>.</db:para> -</db:note> -</db:section> -<db:section xml:id="group.created-signal"> -<db:title>group.created()</db:title> -<db:para>This signal is prefixed with <db:emphasis>group</db:emphasis>.</db:para> -<db:note> -<db:para>The corresponding handler is <db:code>group.onCreated</db:code>.</db:para> -</db:note> -</db:section> -</db:section> -<db:section xml:id="attached-signal-documentation"> -<db:title>Attached Signal Documentation</db:title> -<db:section xml:id="configured-signal"> -<db:title>configured()</db:title> -<db:para>This attached signal is emitted when the type was configured.</db:para> -<db:note> -<db:para>The corresponding handler is <db:code>onConfigured</db:code>.</db:para> -</db:note> -</db:section> -</db:section> -<db:section xml:id="method-documentation"> -<db:title>Method Documentation</db:title> -<db:para>Enables or disables this type.</db:para> -<db:section xml:id="copy-method"> -<db:title>Type copy(<db:emphasis>a</db:emphasis>)</db:title> -<db:para>Returns another Type based on <db:code role="parameter">a</db:code>.</db:para> -</db:section> -</db:section> -<db:section xml:id="obsolete"> -<db:title>Obsolete Members for Type</db:title> -<db:para><db:emphasis role="bold">The following members of QML type <db:link xlink:href="qml-qdoc-test-type.xml">Type</db:link> are deprecated.</db:emphasis> We strongly advise against using them in new code.</db:para> -<db:section xml:id="method-documentation"> -<db:title>Method Documentation</db:title> -<db:section xml:id="deprecatedMethod-method"> -<db:title>deprecatedMethod()</db:title> -<db:para>This method is deprecated since 6.2. We strongly advise against using it in new code.</db:para> -<db:para>This method has no replacement This is a method that should include information about being deprecated and that it has been so since 6.2 in its docs.</db:para> -</db:section> -</db:section> -</db:section> -</db:article> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-yetanotherchild.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-yetanotherchild.xml deleted file mode 100644 index 46f589605..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-yetanotherchild.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>YetAnotherChild QML Type</db:title> -<db:productname>Test</db:productname> -<db:titleabbrev>A test project for QDoc build artifacts</db:titleabbrev> -<db:abstract> -<db:para>A type inheriting from internal abstract parent.</db:para> -</db:abstract> -</db:info> -<db:variablelist> -<db:varlistentry> -<db:term>Import Statement</db:term> -<db:listitem> -<db:para>import QDoc.Test 1.1</db:para> -</db:listitem> -</db:varlistentry> -</db:variablelist> -<db:section xml:id="details"> -<db:title>Detailed Description</db:title> -</db:section> -<db:section xml:id="property-documentation"> -<db:title>Property Documentation</db:title> -<db:section xml:id="prop-prop"> -<db:title>prop : int</db:title> -<db:fieldsynopsis> -<db:type>int</db:type> -<db:varname>prop</db:varname> -<db:modifier>writable</db:modifier> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:fieldsynopsis> -<db:para>Propagated to inheriting type docs.</db:para> -</db:section> -</db:section> -</db:article> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-test-nover-typenoversion.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-test-nover-typenoversion.xml deleted file mode 100644 index 318c6175a..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-test-nover-typenoversion.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>TypeNoVersion QML Type</db:title> -<db:productname>Test</db:productname> -<db:titleabbrev>A test project for QDoc build artifacts</db:titleabbrev> -<db:abstract> -<db:para>Another QML type documented in a .cpp file.</db:para> -</db:abstract> -</db:info> -<db:variablelist> -<db:varlistentry> -<db:term>Import Statement</db:term> -<db:listitem> -<db:para>import Test.NoVer</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term>Instantiates:</db:term> -<db:listitem> -<db:para><db:link xlink:href="testqdoc-testderived.xml">TestDerived</db:link></db:para> -</db:listitem> -</db:varlistentry> -</db:variablelist> -<db:section xml:id="details"> -<db:title>Detailed Description</db:title> -</db:section> -</db:article> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-uicomponents-progressbar.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-uicomponents-progressbar.xml deleted file mode 100644 index 3f162e8a4..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-uicomponents-progressbar.xml +++ /dev/null @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>ProgressBar QML Type</db:title> -<db:productname>Test</db:productname> -<db:titleabbrev>A test project for QDoc build artifacts</db:titleabbrev> -<db:abstract> -<db:para>A component that shows the progress of an event.</db:para> -</db:abstract> -</db:info> -<db:variablelist> -<db:varlistentry> -<db:term>Import Statement</db:term> -<db:listitem> -<db:para>import UIComponents 1.0</db:para> -</db:listitem> -</db:varlistentry> -</db:variablelist> -<db:section xml:id="details"> -<db:title>Detailed Description</db:title> -<db:para>A <db:link xlink:href="qml-uicomponents-progressbar.xml">ProgressBar</db:link> shows the linear progress of an event as its <db:link xlink:href="qml-uicomponents-progressbar.xml#value-prop">value</db:link>. The range is specified using the <db:link xlink:href="qml-uicomponents-progressbar.xml#minimum-prop">minimum</db:link> and the <db:link xlink:href="qml-uicomponents-progressbar.xml#maximum-prop">maximum</db:link> values.</db:para> -<db:para>The <db:link xlink:href="qml-uicomponents-progressbar.xml">ProgressBar</db:link> component is part of the <db:link xlink:href="uicomponents-qmlmodule.xml">UI Components</db:link> module.</db:para> -<db:para>This documentation is part of the <db:link xlink:href="test-componentset-example.xml">UIComponents</db:link> example.</db:para> -</db:section> -<db:section xml:id="property-documentation"> -<db:title>Property Documentation</db:title> -<db:section xml:id="color-prop"> -<db:title>color : color</db:title> -<db:fieldsynopsis> -<db:type>color</db:type> -<db:varname>color</db:varname> -<db:modifier>writable</db:modifier> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:fieldsynopsis> -<db:para>The color of the <db:link xlink:href="qml-uicomponents-progressbar.xml">ProgressBar</db:link>'s gradient. Must bind to a color type.</db:para> -<db:para><db:emphasis>See also </db:emphasis> -<db:simplelist type="vert" role="see-also"><db:member><db:link xlink:href="qml-uicomponents-progressbar.xml#secondColor-prop">secondColor</db:link></db:member> -</db:simplelist> -</db:para></db:section> -<db:section xml:id="maximum-prop"> -<db:title>maximum : int</db:title> -<db:fieldsynopsis> -<db:type>int</db:type> -<db:varname>maximum</db:varname> -<db:modifier>writable</db:modifier> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:fieldsynopsis> -<db:para>The maximum value of the <db:link xlink:href="qml-uicomponents-progressbar.xml">ProgressBar</db:link> range. The <db:link xlink:href="qml-uicomponents-progressbar.xml#value-prop">value</db:link> must not be more than this value.</db:para> -</db:section> -<db:section xml:id="minimum-prop"> -<db:title>minimum : int</db:title> -<db:fieldsynopsis> -<db:type>int</db:type> -<db:varname>minimum</db:varname> -<db:modifier>writable</db:modifier> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:fieldsynopsis> -<db:para>The minimum value of the <db:link xlink:href="qml-uicomponents-progressbar.xml">ProgressBar</db:link> range. The <db:link xlink:href="qml-uicomponents-progressbar.xml#value-prop">value</db:link> must not be less than this value.</db:para> -</db:section> -<db:section xml:id="secondColor-prop"> -<db:title>secondColor : color</db:title> -<db:fieldsynopsis> -<db:type>color</db:type> -<db:varname>secondColor</db:varname> -<db:modifier>writable</db:modifier> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:fieldsynopsis> -<db:para>The second color of the <db:link xlink:href="qml-uicomponents-progressbar.xml">ProgressBar</db:link>'s gradient. Must bind to a color type.</db:para> -<db:para><db:emphasis>See also </db:emphasis> -<db:simplelist type="vert" role="see-also"><db:member><db:link xlink:href="qml-uicomponents-progressbar.xml#color-prop">color</db:link></db:member> -</db:simplelist> -</db:para></db:section> -<db:section xml:id="value-prop"> -<db:title>value : int</db:title> -<db:fieldsynopsis> -<db:type>int</db:type> -<db:varname>value</db:varname> -<db:modifier>writable</db:modifier> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:fieldsynopsis> -<db:para>The value of the progress.</db:para> -</db:section> -</db:section> -</db:article> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-uicomponents-switch.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-uicomponents-switch.xml deleted file mode 100644 index 7b1e169ef..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-uicomponents-switch.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>Switch QML Type</db:title> -<db:productname>Test</db:productname> -<db:titleabbrev>A test project for QDoc build artifacts</db:titleabbrev> -<db:abstract> -<db:para>A component that can be turned on or off.</db:para> -</db:abstract> -</db:info> -<db:variablelist> -<db:varlistentry> -<db:term>Import Statement</db:term> -<db:listitem> -<db:para>import UIComponents 1.0</db:para> -</db:listitem> -</db:varlistentry> -</db:variablelist> -<db:section xml:id="details"> -<db:title>Detailed Description</db:title> -<db:para>A toggle switch has two states: an <db:code>on</db:code> and an <db:code>off</db:code> state. The <db:code>off</db:code> state is when the <db:link xlink:href="qml-uicomponents-switch.xml#on-prop">on</db:link> property is set to <db:code>false</db:code>.</db:para> -<db:para>The ToggleSwitch component is part of the <db:link xlink:href="uicomponents-qmlmodule.xml">UI Components</db:link> module.</db:para> -<db:para>This documentation is part of the <db:link xlink:href="test-componentset-example.xml">UIComponents</db:link> example.</db:para> -</db:section> -<db:section xml:id="property-documentation"> -<db:title>Property Documentation</db:title> -<db:section xml:id="on-prop"> -<db:title>on : bool</db:title> -<db:fieldsynopsis> -<db:type>bool</db:type> -<db:varname>on</db:varname> -<db:modifier>writable</db:modifier> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:fieldsynopsis> -<db:para>Indicates the state of the switch. If <db:code>false</db:code>, then the switch is in the <db:code>off</db:code> state.</db:para> -</db:section> -</db:section> -<db:section xml:id="method-documentation"> -<db:title>Method Documentation</db:title> -<db:section xml:id="toggle-method"> -<db:title>toggle()</db:title> -<db:para>A method to toggle the switch. If the switch is <db:code>on</db:code>, the toggling it will turn it <db:code>off</db:code>. Toggling a switch in the <db:code>off</db:code> position will turn it <db:code>on</db:code>.</db:para> -</db:section> -</db:section> -</db:article> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-uicomponents-tabwidget.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-uicomponents-tabwidget.xml deleted file mode 100644 index 0232dbe27..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-uicomponents-tabwidget.xml +++ /dev/null @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>TabWidget QML Type</db:title> -<db:productname>Test</db:productname> -<db:titleabbrev>A test project for QDoc build artifacts</db:titleabbrev> -<db:abstract> -<db:para>A widget that places its children as tabs.</db:para> -</db:abstract> -</db:info> -<db:variablelist> -<db:varlistentry> -<db:term>Import Statement</db:term> -<db:listitem> -<db:para>import UIComponents 1.0</db:para> -</db:listitem> -</db:varlistentry> -</db:variablelist> -<db:section xml:id="details"> -<db:title>Detailed Description</db:title> -<db:para>A <db:link xlink:href="qml-uicomponents-tabwidget.xml">TabWidget</db:link> places its children as tabs in a view. Selecting a tab involves selecting the tab at the top.</db:para> -<db:para>The <db:link xlink:href="qml-uicomponents-tabwidget.xml">TabWidget</db:link> component is part of the <db:link xlink:href="uicomponents-qmlmodule.xml">UI Components</db:link> module.</db:para> -<db:para>This documentation is part of the <db:link xlink:href="test-componentset-example.xml">UIComponents</db:link> example.</db:para> -<db:section xml:id="adding-tabs"> -<db:title>Adding Tabs</db:title> -<db:para>To add a tab, declare the tab as a child of the <db:link xlink:href="qml-uicomponents-tabwidget.xml">TabWidget</db:link>.</db:para> -<db:programlisting language="cpp">TabWidget { - id: tabwidget - - Rectangle { - id: tab1 - color: <@string>&quot;red&quot;</@string> - <@comment>//... omitted</@comment> - } - Rectangle { - id: tab2 - color: <@string>&quot;blue&quot;</@string> - <@comment>//... omitted</@comment> - } - -} -</db:programlisting> -</db:section> -</db:section> -<db:section xml:id="property-documentation"> -<db:title>Property Documentation</db:title> -<db:section xml:id="current-prop"> -<db:title>current : int</db:title> -<db:fieldsynopsis> -<db:type>int</db:type> -<db:varname>current</db:varname> -<db:modifier>writable</db:modifier> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:fieldsynopsis> -<db:para>The currently active tab in the <db:link xlink:href="qml-uicomponents-tabwidget.xml">TabWidget</db:link>.</db:para> -</db:section> -<db:section xml:id="sampleReadOnlyProperty-prop"> -<db:title>[read-only] sampleReadOnlyProperty : int</db:title> -<db:fieldsynopsis> -<db:type>int</db:type> -<db:varname>sampleReadOnlyProperty</db:varname> -<db:modifier>[read-only]</db:modifier> - -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:fieldsynopsis> -<db:para>A sample <db:code>read-only</db:code> property. A contrived property to demonstrate QDoc's ability to detect read-only properties.</db:para> -<db:para>The signature is:</db:para> -<db:programlisting language="cpp">readonly property <@type>int</@type> sampleReadOnlyProperty: <@number>0</@number> -</db:programlisting> -<db:para>Note that the property must be initialized to a value.</db:para> -</db:section> -</db:section> -</db:article> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/test-componentset-example.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/test-componentset-example.xml deleted file mode 100644 index 5806fc557..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/test-componentset-example.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>QML Documentation Example</db:title> -<db:productname>Test</db:productname> -<db:titleabbrev>A test project for QDoc build artifacts</db:titleabbrev> -<db:abstract> -<db:para>Example for documenting QML types.</db:para> -</db:abstract> -</db:info> -<db:para>This example demonstrates one of the ways to document QML types. It also generates a warning about a missing example image, on purpose.</db:para> -<db:para>In particular, there are sample types that are documented with QDoc commands comments. There are documentation comments for the QML types and their public interfaces. The types are grouped into a module, the <db:link xlink:href="uicomponents-qmlmodule.xml">UI Components</db:link> module.</db:para> -<db:para>The uicomponents.qdoc file generates the overview page for the <db:link xlink:href="uicomponents-qmlmodule.xml">UI Components</db:link> module page.</db:para> -<db:para>The generated documentation is available in the <db:link xlink:href="uicomponents-qmlmodule.xml">UI Components</db:link> module.</db:para> -<db:section xml:id="qml-class"> -<db:title>QML Class</db:title> -<db:para>The QML types use the \qmltype to document the type. In addition, they have the \inmodule command in order for QDoc to associate them to the <db:code>UIComponents</db:code> module.</db:para> -<db:para>QDoc uses the \brief command to place a basic description when listing the types.</db:para> -</db:section> -<db:section xml:id="properties-signals-handlers-and-methods"> -<db:title>Properties, Signals, Handlers, and Methods</db:title> -<db:para>The types have their properties, signals, handlers, and methods defined in their respective QML files. QDoc associates the properties and methods to the types, therefore, you only need to place the documentation above the property, method, or signal.</db:para> -<db:para>To document the type of a <db:emphasis>property alias</db:emphasis>, you must use the \qmlproperty command to specify the data type.</db:para> -<db:programlisting language="cpp">\qmlproperty <@type>int</@type> anAliasedProperty -An aliased property of type <@type>int</@type><@op>.</@op> -</db:programlisting> -<db:section xml:id="internal-documentation"> -<db:title>Internal Documentation</db:title> -<db:para>You may declare that a documentation is for internal use by placing the \internal command after the beginning QDoc comment <db:code>/*</db:code>. QDoc will prevent the internal documentation from appearing in the public API.</db:para> -<db:para>If you wish to omit certain parts of the documentation, you may use the \omit and \endomit command.</db:para> -</db:section> -</db:section> -<db:section xml:id="qml-types-with-c-implementation"> -<db:title>QML Types with C++ Implementation</db:title> -<db:para>This example only demonstrates the documentation for types in QML files, but the regular QML commands may be placed inside C++ classes to define the public API of the QML type.</db:para> -</db:section> -<db:para>Files:</db:para> -<db:itemizedlist><db:listitem> -<db:para><db:link xlink:href="componentset/ProgressBar.qml">componentset/ProgressBar.qml</db:link></db:para></db:listitem> -<db:listitem> -<db:para><db:link xlink:href="componentset/Switch.qml">componentset/Switch.qml</db:link></db:para></db:listitem> -<db:listitem> -<db:para><db:link xlink:href="componentset/TabWidget.qml">componentset/TabWidget.qml</db:link></db:para></db:listitem> -<db:listitem> -<db:para><db:link xlink:href="componentset/componentset.pro">componentset/componentset.pro</db:link></db:para></db:listitem> -<db:listitem> -<db:para><db:link xlink:href="componentset/componentset.qml">componentset/componentset.qml</db:link></db:para></db:listitem> -</db:itemizedlist> -</db:article> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/test-nover-qmlmodule.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/test-nover-qmlmodule.xml deleted file mode 100644 index 7a3138cca..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/test-nover-qmlmodule.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>Versionless QML Module</db:title> -<db:productname>Test</db:productname> -<db:titleabbrev>A test project for QDoc build artifacts</db:titleabbrev> -<db:abstract> -<db:para>QML Types for the Test module without version.</db:para> -<db:para>This module was introduced in Qt 1.1.</db:para> -</db:abstract> -</db:info> -<db:para>This module was introduced in Qt 1.1.</db:para> -<db:anchor xml:id="details"/> -<db:variablelist role="members"> -<db:varlistentry> -<db:term><db:link xlink:href="qml-test-nover-typenoversion.xml" xlink:role="">TypeNoVersion</db:link></db:term> -<db:listitem> -<db:para>Another QML type documented in a .cpp file.</db:para> -</db:listitem> -</db:varlistentry> -</db:variablelist> -</db:article> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/testcpp-module.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/testcpp-module.xml deleted file mode 100644 index dc261f34e..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/testcpp-module.xml +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>QDoc Test C++ Classes</db:title> -<db:productname>TestCPP</db:productname> -<db:titleabbrev>TestCPP Reference Documentation</db:titleabbrev> -<db:abstract> -<db:para>A test module page.</db:para> -</db:abstract> -</db:info> -<db:para>A test module page.</db:para> -<db:section xml:id="namespaces"> -<db:title>Namespaces</db:title> -<db:variablelist role="namespaces"> -<db:varlistentry> -<db:term><db:link xlink:href="crossmoduleref.xml" xlink:role="namespace">CrossModuleRef</db:link></db:term> -<db:listitem> -<db:para>Namespace that has documented functions in multiple modules.</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term><db:link xlink:href="testqdoc.xml" xlink:role="namespace">TestQDoc</db:link></db:term> -<db:listitem> -<db:para>A namespace.</db:para> -</db:listitem> -</db:varlistentry> -</db:variablelist> -</db:section> -<db:section xml:id="classes"> -<db:title>Classes</db:title> -<db:variablelist role="classes"> -<db:varlistentry> -<db:term><db:link xlink:href="testqdoc-test.xml" xlink:role="class">TestQDoc::Test</db:link></db:term> -<db:listitem> -<db:para>A class in a namespace.</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term><db:link xlink:href="testqdoc-testderived.xml" xlink:role="class">TestQDoc::TestDerived</db:link></db:term> -<db:listitem> -<db:para>A derived class in a namespace.</db:para> -</db:listitem> -</db:varlistentry> -</db:variablelist> -</db:section> -<db:section xml:id="details"> -<db:title>Detailed Description</db:title> -<db:note> -<db:para>This is just a test.</db:para> -</db:note> -</db:section> -</db:article> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc-test.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc-test.xml deleted file mode 100644 index c4593d5f5..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc-test.xml +++ /dev/null @@ -1,290 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>Test Class</db:title> -<db:subtitle>TestQDoc::Test</db:subtitle> -<db:productname>TestCPP</db:productname> -<db:titleabbrev>TestCPP Reference Documentation</db:titleabbrev> -<db:abstract> -<db:para>A class in a namespace.</db:para> -</db:abstract> -</db:info> -<db:variablelist> -<db:varlistentry> -<db:term>Header</db:term> -<db:listitem> -<db:para>Test</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term>CMake</db:term> -<db:listitem> -<db:para>find_package(Qt6 COMPONENTS QDocTest REQUIRED)</db:para> -<db:para>target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term>qmake</db:term> -<db:listitem> -<db:para>QT += testcpp</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term>Inherited By</db:term> -<db:listitem> -<db:para><db:link xlink:href="testqdoc-testderived.xml" xlink:role="class">TestQDoc::TestDerived</db:link></db:para> -</db:listitem> -</db:varlistentry> -</db:variablelist> -<db:section xml:id="details"> -<db:title>Detailed Description</db:title> -</db:section> -<db:section xml:id="member-type-documentation"> -<db:title>Member Type Documentation</db:title> -<db:section xml:id="SomeType-typedef"> -<db:title>Test::SomeType</db:title> -<db:typedefsynopsis> -<db:type>SomeType</db:type><db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:typedefsynopsis> -<db:para>A typedef.</db:para> -</db:section> -</db:section> -<db:section xml:id="member-function-documentation"> -<db:title>Member Function Documentation</db:title> -<db:section xml:id="overload"> -<db:title>[protected] Test::void overload()</db:title> -<db:bridgehead renderas="sect2" xml:id="overload-1">[protected, since Test 1.2] Test::void overload(bool <db:emphasis>b</db:emphasis>)</db:bridgehead> -<db:para>Overloads that share a documentation comment, optionally taking a parameter <db:code role="parameter">b</db:code>.</db:para> -</db:section> -<db:section xml:id="Test"> -<db:title>[default] Test::Test()</db:title> -<db:constructorsynopsis> -<db:type></db:type> -<db:methodname>Test</db:methodname> -<db:modifier>default</db:modifier> -<db:void/> -<db:synopsisinfo db:role="meta">constructor</db:synopsisinfo> -<db:synopsisinfo db:role="signature">Test() = default</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:constructorsynopsis> -<db:para>Default constructor.</db:para> -</db:section> -<db:section xml:id="operator-eq"> -<db:title>[default] Test::TestQDoc::Test &operator=(TestQDoc::Test &&<db:emphasis>other</db:emphasis>)</db:title> -<db:methodsynopsis> -<db:type>TestQDoc::Test &</db:type> -<db:methodname>operator=</db:methodname> -<db:modifier>default</db:modifier> -<db:methodparam> -<db:type>TestQDoc::Test &&</db:type> -<db:parameter>other</db:parameter> -</db:methodparam> -<db:synopsisinfo db:role="meta">move-assign</db:synopsisinfo> -<db:synopsisinfo db:role="signature">TestQDoc::Test & operator=(TestQDoc::Test &&other) = default</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -<db:para>Move-assigns <db:code role="parameter">other</db:code>.</db:para> -</db:section> -<db:section xml:id="funcPtr"> -<db:title>Test::void (*)(bool) funcPtr(bool <db:emphasis>b</db:emphasis>, const char *<db:emphasis>s</db:emphasis>)</db:title> -<db:methodsynopsis> -<db:type>void (*)(bool)</db:type> -<db:methodname>funcPtr</db:methodname> -<db:methodparam> -<db:type>bool</db:type> -<db:parameter>b</db:parameter> -</db:methodparam> -<db:methodparam> -<db:type>const char *</db:type> -<db:parameter>s</db:parameter> -</db:methodparam> -<db:synopsisinfo db:role="meta">plain</db:synopsisinfo> -<db:synopsisinfo db:role="signature">void (*)(bool) funcPtr(bool b, const char *s)</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -<db:para>Returns a pointer to a function that takes a boolean. Uses <db:code role="parameter">b</db:code> and <db:code role="parameter">s</db:code>.</db:para> -</db:section> -<db:section xml:id="inlineFunction"> -<db:title>Test::void inlineFunction()</db:title> -<db:methodsynopsis> -<db:void/> -<db:methodname>inlineFunction</db:methodname> -<db:void/> -<db:synopsisinfo db:role="meta">plain</db:synopsisinfo> -<db:synopsisinfo db:role="signature">void inlineFunction()</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -<db:para>An inline function, documented using the \fn QDoc command.</db:para> -</db:section> -<db:section xml:id="someFunction"> -<db:title>Test::int someFunction(<db:emphasis>int</db:emphasis>, int <db:emphasis>v</db:emphasis> = 0)</db:title> -<db:methodsynopsis> -<db:type>int</db:type> -<db:methodname>someFunction</db:methodname> -<db:methodparam> -<db:type>int</db:type> -<db:parameter></db:parameter> -</db:methodparam> -<db:methodparam> -<db:type>int</db:type> -<db:parameter>v</db:parameter> -<db:initializer>0</db:initializer> -</db:methodparam> -<db:synopsisinfo db:role="meta">plain</db:synopsisinfo> -<db:synopsisinfo db:role="signature">int someFunction(int, int v)</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -<db:para>Function that takes a parameter <db:code role="parameter">v</db:code>. Also returns the value of <db:code role="parameter">v</db:code>.</db:para> -</db:section> -<db:section xml:id="someFunctionDefaultArg"> -<db:title>Test::void someFunctionDefaultArg(int <db:emphasis>i</db:emphasis>, bool <db:emphasis>b</db:emphasis> = false)</db:title> -<db:methodsynopsis> -<db:void/> -<db:methodname>someFunctionDefaultArg</db:methodname> -<db:methodparam> -<db:type>int</db:type> -<db:parameter>i</db:parameter> -</db:methodparam> -<db:methodparam> -<db:type>bool</db:type> -<db:parameter>b</db:parameter> -<db:initializer>false</db:initializer> -</db:methodparam> -<db:synopsisinfo db:role="meta">plain</db:synopsisinfo> -<db:synopsisinfo db:role="signature">void someFunctionDefaultArg(int i, bool b)</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -<db:para>Function that takes a parameter <db:code role="parameter">i</db:code> and <db:code role="parameter">b</db:code>.</db:para> -</db:section> -<db:section xml:id="virtualFun"> -<db:title>[virtual] Test::void virtualFun()</db:title> -<db:methodsynopsis> -<db:modifier>virtual</db:modifier> -<db:void/> -<db:methodname>virtualFun</db:methodname> -<db:void/> -<db:synopsisinfo db:role="meta">plain</db:synopsisinfo> -<db:synopsisinfo db:role="signature">void virtualFun()</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -<db:para>Function that must be reimplemented.</db:para> -</db:section> -</db:section> -<db:section xml:id="related-non-members"> -<db:title>Related Non-Members</db:title> -<db:section xml:id="operator-eq-eq"> -<db:title>bool operator==(const TestQDoc::Test &<db:emphasis>lhs</db:emphasis>, const TestQDoc::Test &<db:emphasis>rhs</db:emphasis>)</db:title> -<db:methodsynopsis> -<db:type>bool</db:type> -<db:methodname>operator==</db:methodname> -<db:methodparam> -<db:type>const TestQDoc::Test &</db:type> -<db:parameter>lhs</db:parameter> -</db:methodparam> -<db:methodparam> -<db:type>const TestQDoc::Test &</db:type> -<db:parameter>rhs</db:parameter> -</db:methodparam> -<db:synopsisinfo db:role="meta">plain</db:synopsisinfo> -<db:synopsisinfo db:role="signature">bool operator==(const TestQDoc::Test &lhs, const TestQDoc::Test &rhs)</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -<db:para>Returns true if <db:code role="parameter">lhs</db:code> and <db:code role="parameter">rhs</db:code> are equal.</db:para> -</db:section> -</db:section> -<db:section xml:id="macro-documentation"> -<db:title>Macro Documentation</db:title> -<db:section xml:id="QDOCTEST_MACRO2"> -<db:title>[since Test 1.1] QDOCTEST_MACRO2(int &<db:emphasis>x</db:emphasis>)</db:title> -<db:methodsynopsis> -<db:methodname>QDOCTEST_MACR</db:methodname> -<db:methodparam> -<db:type>int &</db:type> -<db:parameter>x</db:parameter> -</db:methodparam> -<db:synopsisinfo db:role="meta">macrowithparams</db:synopsisinfo> -<db:synopsisinfo db:role="signature">QDOCTEST_MACRO2(int &x)</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -<db:para>A macro with argument <db:code role="parameter">x</db:code>.</db:para> -<db:para>This function was introduced in Test 1.1.</db:para> -</db:section> -</db:section> -<db:section xml:id="obsolete"> -<db:title>Obsolete Members for Test</db:title> -<db:para><db:emphasis role="bold">The following members of class <db:link xlink:href="testqdoc-test.xml">Test</db:link> are deprecated.</db:emphasis> We strongly advise against using them in new code.</db:para> -<db:section xml:id="member-function-documentation"> -<db:title>Member Function Documentation</db:title> -<db:section xml:id="operator-2b-2b"> -<db:title>Test::TestQDoc::Test &operator++()</db:title> -<db:bridgehead renderas="sect2" xml:id="operator--">Test::TestQDoc::Test &operator--()</db:bridgehead> -<db:para>This function is deprecated. We strongly advise against using it in new code.</db:para> -</db:section> -<db:section xml:id="anotherObsoleteMember"> -<db:title>Test::void anotherObsoleteMember()</db:title> -<db:methodsynopsis> -<db:void/> -<db:methodname>anotherObsoleteMember</db:methodname> -<db:void/> -<db:synopsisinfo db:role="meta">plain</db:synopsisinfo> -<db:synopsisinfo db:role="signature">void anotherObsoleteMember()</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">deprecated</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -<db:para>This function is deprecated. We strongly advise against using it in new code.</db:para> -<db:para>Use <db:link xlink:href="testqdoc-test.xml#obsoleteMember">obsoleteMember</db:link>() instead.</db:para> -</db:section> -<db:section xml:id="deprecatedMember"> -<db:title>Test::void deprecatedMember()</db:title> -<db:methodsynopsis> -<db:void/> -<db:methodname>deprecatedMember</db:methodname> -<db:void/> -<db:synopsisinfo db:role="meta">plain</db:synopsisinfo> -<db:synopsisinfo db:role="signature">void deprecatedMember()</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">deprecated</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -<db:para>This function is deprecated since 6.0. We strongly advise against using it in new code.</db:para> -<db:para>Use <db:link xlink:href="testqdoc-test.xml#someFunction">someFunction</db:link>() instead.</db:para> -</db:section> -<db:section xml:id="obsoleteMember"> -<db:title>Test::void obsoleteMember()</db:title> -<db:methodsynopsis> -<db:void/> -<db:methodname>obsoleteMember</db:methodname> -<db:void/> -<db:synopsisinfo db:role="meta">plain</db:synopsisinfo> -<db:synopsisinfo db:role="signature">void obsoleteMember()</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">deprecated</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -<db:para>This function is deprecated. We strongly advise against using it in new code.</db:para> -<db:para>Use <db:link xlink:href="testqdoc-test.xml#someFunction">someFunction</db:link>() instead.</db:para> -</db:section> -</db:section> -</db:section> -</db:article> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc-testderived.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc-testderived.xml deleted file mode 100644 index 0b1218cd2..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc-testderived.xml +++ /dev/null @@ -1,104 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>TestDerived Class</db:title> -<db:subtitle>TestQDoc::TestDerived</db:subtitle> -<db:productname>TestCPP</db:productname> -<db:titleabbrev>TestCPP Reference Documentation</db:titleabbrev> -<db:abstract> -<db:para>A derived class in a namespace.</db:para> -</db:abstract> -</db:info> -<db:variablelist> -<db:varlistentry> -<db:term>Header</db:term> -<db:listitem> -<db:para>TestDerived</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term>CMake</db:term> -<db:listitem> -<db:para>find_package(Qt6 COMPONENTS QDocTest REQUIRED)</db:para> -<db:para>target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term>qmake</db:term> -<db:listitem> -<db:para>QT += testcpp</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term>Inherits</db:term> -<db:listitem> -<db:para><db:link xlink:href="testqdoc-test.xml" xlink:role="class">TestQDoc::Test</db:link></db:para> -</db:listitem> -</db:varlistentry> -</db:variablelist> -<db:section xml:id="details"> -<db:title>Detailed Description</db:title> -</db:section> -<db:section xml:id="member-type-documentation"> -<db:title>Member Type Documentation</db:title> -<db:section xml:id="DerivedType-typedef"> -<db:title>[alias] TestDerived::DerivedType</db:title> -<db:typedefsynopsis> -<db:type>DerivedType</db:type><db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:typedefsynopsis> -<db:para>An aliased typedef.</db:para> -</db:section> -<db:section xml:id="NotTypedef-typedef"> -<db:title>[alias] TestDerived::NotTypedef</db:title> -<db:typedefsynopsis> -<db:type>NotTypedef</db:type><db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:typedefsynopsis> -<db:para>I'm an alias, not a typedef.</db:para> -</db:section> -</db:section> -<db:section xml:id="member-function-documentation"> -<db:title>Member Function Documentation</db:title> -<db:section xml:id="virtualFun"> -<db:title>[override virtual] TestDerived::void virtualFun()</db:title> -<db:methodsynopsis> -<db:modifier>virtual</db:modifier> -<db:void/> -<db:methodname>virtualFun</db:methodname> -<db:modifier>override</db:modifier> -<db:void/> -<db:synopsisinfo db:role="meta">plain</db:synopsisinfo> -<db:synopsisinfo db:role="signature">void virtualFun() override</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -<db:para>Reimplements: <db:link xlink:href="testqdoc-test.xml#virtualFun" type="function">Test::virtualFun()</db:link>.</db:para> -</db:section> -<db:section xml:id="obsolete"> -<db:title>Obsolete Members for TestDerived</db:title> -<db:para><db:emphasis role="bold">The following members of class <db:link xlink:href="testqdoc-testderived.xml">TestDerived</db:link> are deprecated.</db:emphasis> We strongly advise against using them in new code.</db:para> -<db:section xml:id="member-function-documentation"> -<db:title>Member Function Documentation</db:title> -<db:section xml:id="staticObsoleteMember"> -<db:title>[static] TestDerived::void staticObsoleteMember()</db:title> -<db:methodsynopsis> -<db:modifier>static</db:modifier> -<db:void/> -<db:methodname>staticObsoleteMember</db:methodname> -<db:void/> -<db:synopsisinfo db:role="meta">plain</db:synopsisinfo> -<db:synopsisinfo db:role="signature">void staticObsoleteMember()</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">deprecated</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -<db:para>This function is deprecated. We strongly advise against using it in new code.</db:para> -<db:para>Static obsolete method.</db:para> -</db:section> -</db:section> -</db:section> -</db:section></db:article> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc.xml deleted file mode 100644 index 2840ef76c..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc.xml +++ /dev/null @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>TestQDoc Namespace</db:title> -<db:productname>TestCPP</db:productname> -<db:titleabbrev>TestCPP Reference Documentation</db:titleabbrev> -<db:abstract> -<db:para>A namespace.</db:para> -</db:abstract> -</db:info> -<db:variablelist> -<db:varlistentry> -<db:term>Header</db:term> -<db:listitem> -<db:para>TestCPP</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term>CMake</db:term> -<db:listitem> -<db:para>find_package(Qt6 COMPONENTS QDocTest REQUIRED)</db:para> -<db:para>target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term>qmake</db:term> -<db:listitem> -<db:para>QT += testcpp</db:para> -</db:listitem> -</db:varlistentry> -</db:variablelist> -<db:section xml:id="details"> -<db:title>Detailed Description</db:title> -<db:section xml:id="usage"> -<db:title>Usage</db:title> -<db:para>This namespace is for testing QDoc output.</db:para> -</db:section> -</db:section> -<db:section xml:id="classes"> -<db:title>Classes</db:title> -<db:section> -<db:title>class <db:link xlink:href="testqdoc-test.xml" xlink:role="class">Test</db:link></db:title> -<db:para>A class in a namespace.</db:para> -</db:section> -<db:section> -<db:title>class <db:link xlink:href="testqdoc-testderived.xml" xlink:role="class">TestDerived</db:link></db:title> -<db:para>A derived class in a namespace.</db:para> -</db:section> -</db:section> -<db:section xml:id="macro-documentation"> -<db:title>Macro Documentation</db:title> -<db:section xml:id="QDOCTEST_MACRO"> -<db:title>QDOCTEST_MACRO</db:title> -<db:methodsynopsis> -<db:methodname>QDOCTEST_MAC</db:methodname> -<db:synopsisinfo db:role="meta">macrowithoutparams</db:synopsisinfo> -<db:synopsisinfo db:role="signature">QDOCTEST_MACRO</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -</db:section> -</db:section> -</db:article> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/uicomponents-qmlmodule.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/uicomponents-qmlmodule.xml deleted file mode 100644 index f00b3d3f7..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/uicomponents-qmlmodule.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>UI Components</db:title> -<db:productname>Test</db:productname> -<db:titleabbrev>A test project for QDoc build artifacts</db:titleabbrev> -<db:abstract> -<db:para>Basic set of UI components.</db:para> -</db:abstract> -</db:info> -<db:anchor xml:id="details"/> -<db:para>This is a listing of a list of UI components implemented by QML types. These files are available for general import and they are based on the Qt Quick Code Samples.</db:para> -<db:para>This module is part of the <db:link xlink:href="test-componentset-example.xml">UIComponents</db:link> example.</db:para> -<db:variablelist role="members"> -<db:varlistentry> -<db:term><db:link xlink:href="qml-uicomponents-progressbar.xml" xlink:role="">ProgressBar</db:link></db:term> -<db:listitem> -<db:para>A component that shows the progress of an event.</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term><db:link xlink:href="qml-uicomponents-switch.xml" xlink:role="">Switch</db:link></db:term> -<db:listitem> -<db:para>A component that can be turned on or off.</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term><db:link xlink:href="qml-uicomponents-tabwidget.xml" xlink:role="">TabWidget</db:link></db:term> -<db:listitem> -<db:para>A widget that places its children as tabs.</db:para> -</db:listitem> -</db:varlistentry> -</db:variablelist> -</db:article> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/classes.html b/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/classes.html deleted file mode 100644 index 423ef6b42..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/classes.html +++ /dev/null @@ -1,21 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- test.qdoc --> - <title>Classes | TestCPP</title> -</head> -<body> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Classes</h1> -<!-- $$$classes.html-description --> -<div class="descr" id="details"> -<div class="table"><table class="annotated"> -<tr class="odd topAlign"><td class="tblName"><p><a href="seenclass.html">SeenClass</a></p></td><td class="tblDescr"><p>A public but undocumented class</p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="testqdoc-test.html">TestQDoc::Test</a></p></td><td class="tblDescr"><p>A class in a namespace</p></td></tr> -<tr class="odd topAlign"><td class="tblName"><p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p></td><td class="tblDescr"><p>A derived class in a namespace</p></td></tr> -</table></div> -</div> -<!-- @@@classes.html --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/dontdocument.qhp b/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/dontdocument.qhp deleted file mode 100644 index 863a9385c..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/dontdocument.qhp +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<QtHelpProject version="1.0"> - <namespace>org.qt-project.dontdocument.001</namespace> - <virtualFolder>test</virtualFolder> - <metaData name="version" value=""/> - <filterSection> - <toc> - <section ref="testcpp-module.html" title="QDoc Test C++ Classes"> - <section ref="testcpp-module.html" title="Classes"> - <section ref="seenclass.html" title="SeenClass Class Reference"/> - <section ref="testqdoc-test.html" title="TestQDoc::Test Class Reference"> - <section ref="testqdoc-test-members.html" title="List of all members"/> - <section ref="testqdoc-test-obsolete.html" title="Obsolete members"/> - </section> - <section ref="testqdoc-testderived.html" title="TestQDoc::TestDerived Class Reference"> - <section ref="testqdoc-testderived-members.html" title="List of all members"/> - <section ref="testqdoc-testderived-obsolete.html" title="Obsolete members"/> - </section> - </section> - </section> - </toc> - <keywords> - <keyword name="Autolinking" id="Autolinking" ref="autolinking.html"/> - <keyword name="Classes" id="Classes" ref="classes.html"/> - <keyword name="CrossModuleRef" id="CrossModuleRef" ref="crossmoduleref.html"/> - <keyword name="Obsolete Classes" id="Obsolete Classes" ref="obsolete-classes.html"/> - <keyword name="QDOCTEST_MACRO" id="QDOCTEST_MACRO" ref="testqdoc.html#QDOCTEST_MACRO"/> - <keyword name="QDOCTEST_MACRO2" id="QDOCTEST_MACRO2" ref="testqdoc-test.html#QDOCTEST_MACRO2"/> - <keyword name="QDoc Test C++ Classes" id="QDoc Test C++ Classes" ref="testcpp-module.html"/> - <keyword name="SeenClass" id="SeenClass" ref="seenclass.html"/> - <keyword name="Test" id="TestQDoc::Test" ref="testqdoc-test.html"/> - <keyword name="Test::SomeType" id="Test::SomeType" ref="testqdoc-test.html#SomeType-typedef"/> - <keyword name="TestDerived" id="TestQDoc::TestDerived" ref="testqdoc-testderived.html"/> - <keyword name="TestDerived::DerivedType" id="TestDerived::DerivedType" ref="testqdoc-testderived.html#DerivedType-typedef"/> - <keyword name="TestDerived::NotTypedef" id="TestDerived::NotTypedef" ref="testqdoc-testderived.html#NotTypedef-typedef"/> - <keyword name="TestQDoc" id="TestQDoc" ref="testqdoc.html"/> - <keyword name="anotherObsoleteMember" id="Test::anotherObsoleteMember" ref="testqdoc-test-obsolete.html#anotherObsoleteMember"/> - <keyword name="deprecatedMember" id="Test::deprecatedMember" ref="testqdoc-test-obsolete.html#deprecatedMember"/> - <keyword name="documentMe" id="CrossModuleRef::documentMe" ref="crossmoduleref.html#documentMe"/> - <keyword name="funcPtr" id="Test::funcPtr" ref="testqdoc-test.html#funcPtr"/> - <keyword name="inlineFunction" id="Test::inlineFunction" ref="testqdoc-test.html#inlineFunction"/> - <keyword name="obsoleteMember" id="Test::obsoleteMember" ref="testqdoc-test-obsolete.html#obsoleteMember"/> - <keyword name="operator++" id="Test::operator++" ref="testqdoc-test-obsolete.html#operator-2b-2b"/> - <keyword name="operator--" id="Test::operator--" ref="testqdoc-test-obsolete.html#operator--"/> - <keyword name="operator=" id="Test::operator=" ref="testqdoc-test.html#operator-eq"/> - <keyword name="operator==" id="operator==" ref="testqdoc-test.html#operator-eq-eq"/> - <keyword name="overload" id="Test::overload" ref="testqdoc-test.html#overload"/> - <keyword name="someFunction" id="Test::someFunction" ref="testqdoc-test.html#someFunction"/> - <keyword name="someFunctionDefaultArg" id="Test::someFunctionDefaultArg" ref="testqdoc-test.html#someFunctionDefaultArg"/> - <keyword name="staticObsoleteMember" id="TestDerived::staticObsoleteMember" ref="testqdoc-testderived-obsolete.html#staticObsoleteMember"/> - <keyword name="virtualFun" id="Test::virtualFun" ref="testqdoc-test.html#virtualFun"/> - <keyword name="virtualFun" id="TestDerived::virtualFun" ref="testqdoc-testderived.html#virtualFun"/> - </keywords> - <files> - <file>autolinking.html</file> - <file>classes.html</file> - <file>crossmoduleref.html</file> - <file>obsolete-classes.html</file> - <file>seenclass.html</file> - <file>testcpp-module.html</file> - <file>testqdoc-test-members.html</file> - <file>testqdoc-test-obsolete.html</file> - <file>testqdoc-test.html</file> - <file>testqdoc-testderived-members.html</file> - <file>testqdoc-testderived-obsolete.html</file> - <file>testqdoc-testderived.html</file> - <file>testqdoc.html</file> - </files> - </filterSection> -</QtHelpProject> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/seenclass.html b/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/seenclass.html deleted file mode 100644 index 6346ec6d7..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/seenclass.html +++ /dev/null @@ -1,32 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- dont.cpp --> - <title>SeenClass Class | TestCPP</title> -</head> -<body> -<li>SeenClass</li> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">SeenClass Class</h1> -<!-- $$$SeenClass-brief --> -<p>A public but undocumented class. <a href="#details">More...</a></p> -<!-- @@@SeenClass --> -<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> -<!-- $$$SeenClass-description --> -<div class="descr"> -<h2 id="details">Detailed Description</h2> -</div> -<!-- @@@SeenClass --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/examples-manifest.xml b/tests/auto/qdoc/generatedoutput/expected_output/examples-manifest.xml deleted file mode 100644 index 4d8a61cfb..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/examples-manifest.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<instructionals module="Test"> - <examples> - <example docUrl="qthelp://org.qt-project.test.001/test/test-cmaketest-example.html" imageUrl="qthelp://org.qt-project.test.001/test/images/leonardo-da-vinci.png" isTest="true" name="CMake Example Project" projectPath="test/cmaketest/CMakeLists.txt"> - <description><![CDATA[No description available]]></description> - <tags>cmake,project,test</tags> - <fileToOpen mainFile="true">test/cmaketest/main.cpp</fileToOpen> - </example> - <example docUrl="qthelp://org.qt-project.test.001/test/test-componentset-example.html" isTest="true" name="QML Documentation Example" projectPath="tutorials/componentset/componentset.pro"> - <description><![CDATA[Example for documenting QML types.]]></description> - <tags>documentation,qml,sample,test</tags> - <fileToOpen mainFile="true">tutorials/componentset/componentset.qml</fileToOpen> - </example> - </examples> -</instructionals> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/first.html b/tests/auto/qdoc/generatedoutput/expected_output/first.html deleted file mode 100644 index f46004f6e..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/first.html +++ /dev/null @@ -1,37 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- main.cpp --> - <title>First Struct | TestModule</title> -</head> -<body> -<li>First</li> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#public-types">Public Types</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">First Struct</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> -<li><a href="first-members.html">List of all members, including inherited members</a></li> -</ul> -<h2 id="public-types">Public Types</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> class </td><td class="memItemRight bottomAlign"><b><a href="first-nested.html">Nested</a></b></td></tr> -</table></div> -<!-- $$$First-description --> -<div class="descr"> -<h2 id="details">Detailed Description</h2> -<p>This is a first class</p> -</div> -<!-- @@@First --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/globals.html b/tests/auto/qdoc/generatedoutput/expected_output/globals.html deleted file mode 100644 index 943907b61..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/globals.html +++ /dev/null @@ -1,45 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- global.qdoc --> - <title>Globals Class | TestGlobals</title> -</head> -<body> -<li>Globals</li> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#related-non-members">Related Non-Members</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<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> -<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> -<tr><td class="memItemLeft rightAlign topAlign"> int </td><td class="memItemRight bottomAlign"><b><a href="globals.html#foo-1">foo</a></b>(int <i>a</i>, bool <i>b</i>)</td></tr> -</table></div> -<!-- $$$Globals-description --> -<div class="descr"> -<h2 id="details">Detailed Description</h2> -</div> -<!-- @@@Globals --> -<div class="relnonmem"> -<h2>Related Non-Members</h2> -<!-- $$$foo[overload1]$$$fooint --> -<h3 class="fn" id="foo"><span class="type">int</span> <span class="name">foo</span>(<span class="type">int</span> <i>a</i>)</h3> -<p>Params: <i>a</i></p> -<!-- @@@foo --> -<!-- $$$foo$$$foointbool --> -<h3 class="fn" id="foo-1"><span class="type">int</span> <span class="name">foo</span>(<span class="type">int</span> <i>a</i>, <span class="type">bool</span> <i>b</i>)</h3> -<p>Params: <i>b</i>, <i>b</i></p> -<!-- @@@foo --> -</div> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/headerfile-docbook/headers.xml b/tests/auto/qdoc/generatedoutput/expected_output/headerfile-docbook/headers.xml deleted file mode 100644 index 052108b2a..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/headerfile-docbook/headers.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>Headers</db:title> -<db:productname>HeaderFile</db:productname> -<db:titleabbrev>HeaderFile Reference Documentation</db:titleabbrev> -<db:abstract> -<db:para>HeaderFile Reference Documentation.</db:para></db:abstract> -</db:info> -<db:anchor xml:id="details"/> -<db:variablelist role="members"> -<db:varlistentry> -<db:term><db:link xlink:href="testheader.xml" xlink:role=""><TestHeader></db:link></db:term> -<db:listitem> -<db:para>A header file.</db:para> -</db:listitem> -</db:varlistentry> -</db:variablelist> -</db:article> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/headerfile-docbook/testheader.xml b/tests/auto/qdoc/generatedoutput/expected_output/headerfile-docbook/testheader.xml deleted file mode 100644 index 5c5b9c179..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/headerfile-docbook/testheader.xml +++ /dev/null @@ -1,87 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title><TestHeader> - Test Header</db:title> -<db:productname>HeaderFile</db:productname> -<db:titleabbrev>HeaderFile Reference Documentation</db:titleabbrev> -<db:abstract> -<db:para>A header file.</db:para> -</db:abstract> -</db:info> -<db:variablelist> -<db:varlistentry> -<db:term>Header</db:term> -<db:listitem> -<db:para>TestHeader</db:para> -</db:listitem> -</db:varlistentry> -</db:variablelist> -<db:section xml:id="details"> -<db:title>Detailed Description</db:title> -</db:section> -<db:section xml:id="type-documentation"> -<db:title>Type Documentation</db:title> -<db:section xml:id="Globals-enum"> -<db:title>enum Globals</db:title> -<db:enumsynopsis> -<db:enumname>Globals</db:enumname> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:enumitem db:enumidentifier="Glo" db:enumvalue="0"/> -<db:enumitem db:enumidentifier="Bal" db:enumvalue="1"/> -</db:enumsynopsis> -<db:informaltable> -<db:thead> -<db:tr> -<db:th>Constant</db:th> -<db:th>Description</db:th> -</db:tr> -</db:thead> -<db:tr> -<db:td> -<db:para><db:code>Glo</db:code></db:para> -</db:td> -<db:td><db:code>0</db:code></db:td> -</db:tr> -<db:tr> -<db:td> -<db:para><db:code>Bal</db:code></db:para> -</db:td> -<db:td><db:code>1</db:code></db:td> -</db:tr> -</db:informaltable> -</db:section> -</db:section> -<db:section xml:id="variable-documentation"> -<db:title>Variable Documentation</db:title> -<db:section xml:id="globalVar-var"> -<db:title>const int globalVar</db:title> -<db:fieldsynopsis> -<db:type>const int</db:type> -<db:varname>globalVar</db:varname> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:fieldsynopsis> -<db:para>Global variable.</db:para> -</db:section> -</db:section> -<db:section xml:id="function-documentation"> -<db:title>Function Documentation</db:title> -<db:section xml:id="globalFunc"> -<db:title>void globalFunc()</db:title> -<db:methodsynopsis> -<db:void/> -<db:methodname>globalFunc</db:methodname> -<db:void/> -<db:synopsisinfo db:role="meta">plain</db:synopsisinfo> -<db:synopsisinfo db:role="signature">void globalFunc()</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -<db:para>Global function.</db:para> -</db:section> -</db:section> -</db:article> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/headerfile/headers.html b/tests/auto/qdoc/generatedoutput/expected_output/headerfile/headers.html deleted file mode 100644 index fd53f896e..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/headerfile/headers.html +++ /dev/null @@ -1,19 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testheader.cpp --> - <title>Headers | HeaderFile</title> -</head> -<body> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Headers</h1> -<!-- $$$headers-description --> -<div class="descr" id="details"> -</div> -<!-- @@@headers --> -<div class="table"><table class="annotated"> -<tr class="odd topAlign"><td class="tblName"><p><a href="testheader.html"><TestHeader></a></p></td><td class="tblDescr"><p>A header file</p></td></tr> -</table></div> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/headerfile/testheader.html b/tests/auto/qdoc/generatedoutput/expected_output/headerfile/testheader.html deleted file mode 100644 index e8abcc769..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/headerfile/testheader.html +++ /dev/null @@ -1,65 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testheader.cpp --> - <title><TestHeader> - Test Header | HeaderFile</title> -</head> -<body> -<li><a href="headers.html">Headers</a></li> -<li><TestHeader> - Test Header</li> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title"><TestHeader> - Test Header</h1> -<!-- $$$<TestHeader>-brief --> -<p>A header file. <a href="#details">More...</a></p> -<!-- @@@<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> -<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> -</table></div> -<h2 id="variables">Variables</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> const int </td><td class="memItemRight bottomAlign"><b><a href="testheader.html#globalVar-var">globalVar</a></b></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="testheader.html#globalFunc">globalFunc</a></b>()</td></tr> -</table></div> -<!-- $$$<TestHeader>-description --> -<div class="descr"> -<h2 id="details">Detailed Description</h2> -</div> -<!-- @@@<TestHeader> --> -<div class="types"> -<h2>Type Documentation</h2> -<!-- $$$Globals$$$Glo$$$Bal --> -<h3 class="fn" id="Globals-enum">enum <span class="name">Globals</span></h3> -<div class="table"><table class="valuelist"><tr><th class="tblConst">Constant</th><th class="tblVal">Value</th></tr> -<tr><td class="topAlign"><code>Glo</code></td><td class="topAlign tblval"><code>0</code></td></tr> -<tr><td class="topAlign"><code>Bal</code></td><td class="topAlign tblval"><code>1</code></td></tr> -</table></div> -<!-- @@@Globals --> -</div> -<div class="vars"> -<h2>Variable Documentation</h2> -<!-- $$$globalVar --> -<h3 class="fn" id="globalVar-var">const <span class="type">int</span> <span class="name">globalVar</span></h3> -<p>Global variable.</p> -<!-- @@@globalVar --> -</div> -<div class="func"> -<h2>Function Documentation</h2> -<!-- $$$globalFunc[overload1]$$$globalFunc --> -<h3 class="fn" id="globalFunc"><span class="type">void</span> <span class="name">globalFunc</span>()</h3> -<p>Global function.</p> -<!-- @@@globalFunc --> -</div> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/first.webxml b/tests/auto/qdoc/generatedoutput/expected_output/html/first.webxml deleted file mode 100644 index 526bbbe73..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/html/first.webxml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<WebXML> - <document> - <struct name="First" href="first.html" status="active" access="public" location="bbb.h" documented="true" module="TestModule"> - <description> - <para>This is a first class</para> - </description> - <class name="Nested" fullname="First::Nested" href="first-nested.html" status="active" access="public" location="bbb.h" documented="true" module="TestModule"> - <description> - <para>This is a nested class</para> - </description> - </class> - </struct> - </document> -</WebXML> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/index.webxml b/tests/auto/qdoc/generatedoutput/expected_output/html/index.webxml deleted file mode 100644 index 659d98f22..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/html/index.webxml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<WebXML> - <document> - <page name="index.html" href="index.html" status="active" location="index.qdoc" documented="true" subtype="page" title="doc index" fulltitle="doc index" subtitle=""> - <description> - <generatedlist contents="classesbymodule TestModule"/> - </description> - </page> - </document> -</WebXML> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput-exhaustive.webxml b/tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput-exhaustive.webxml deleted file mode 100644 index 276d08372..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput-exhaustive.webxml +++ /dev/null @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<WebXML> - <document> - <page name="qdoctests-qdocfileoutput-exhaustive.html" href="qdoctests-qdocfileoutput-exhaustive.html" status="active" location="qdoctests-outputfromqdocfiles.qdoc" documented="true" subtype="page" title="Exhaustive testing of QDoc commands" fulltitle="Exhaustive testing of QDoc commands" subtitle="" brief="This page is a dumping ground for QDoc commands under test"> - <contents name="this-is-a-section1" title="This is a section1" level="1"/> - <contents name="this-is-a-section2" title="This is a section2" level="2"/> - <contents name="this-is-a-section3" title="This is a section3" level="3"/> - <contents name="this-is-a-section4" title="This is a section4" level="4"/> - <description> - <brief>This page is a dumping ground for QDoc commands under test.</brief> - <section id="this-is-a-section1"> - <heading level="1">This is a section1</heading> - </section> - <section id="this-is-a-section2"> - <heading level="2">This is a section2</heading> - </section> - <section id="this-is-a-section3"> - <heading level="3">This is a section3</heading> - </section> - <section id="this-is-a-section4"> - <heading level="4">This is a section4</heading> - </section> - </description> - </page> - </document> - <badcode>This is bad code</badcode> - <para>This text should have a line break riiiiight noooow.</para> - <para> - <bold>All your text belong to bold</bold> ...And this is an examble of only <bold>bold</bold> being, well, bold.</para> - <dots indent="4">...</dots> - <para>And if I knew qmltext, I guess this is where that would go. </para>This a caption<legalese> - <para>Lorem legal ipsum</para> - </legalese> - <quote> - <para>This is a quotation.</para> - </quote> - <raw format="HTML"> <html><body>This is <b>raw</b>. Like the <h1>Eddie Murphy</h1> movie. Just not as funny.</body></html> - </raw> - <para>Look, ma! I made a sidebar!</para> - <table> - <row> - <item> - <para>Table item in a table row</para> - </item> - </row> - <row> - <item> - <para>Another item in a different row</para> - </item> - </row> - </table> - <para> - <bold>Important:</bold> This is really important.</para> - <para>For example, if you have code like</para> - <oldcode>This is old code.</oldcode> - <para>you can rewrite it as</para> - <newcode>This is new and shiny!</newcode> - <para> - <bold>Note:</bold> The code above doesn't compile</para> - <para> - <bold>Warning:</bold> The following commands have yet to be tested: footnote link sincelist header index topicref // or just don’t care, remove it image inlineimage printline printto printuntil // what’s the difference between printto and printuntil??? quotefile quotefromfile quotefunction skipline skipto skipuntil span snippet codeline overload sub sup tableofcontents tt uicontrol endmapref endomit underline unicode</para> -</WebXML> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput-linking.webxml b/tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput-linking.webxml deleted file mode 100644 index 1bb19e10e..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput-linking.webxml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<WebXML> - <document> - <page name="qdoctests-qdocfileoutput-linking.html" href="qdoctests-qdocfileoutput-linking.html" status="active" location="qdoctests-outputfromqdocfiles.qdoc" documented="true" subtype="page" title="Testing QDoc's link command" fulltitle="Testing QDoc's link command" subtitle="" brief="This is a page for testing QDoc's link command"> - <target name="link-test-target"/> - <keyword name="qdoc-linking-test" title="QDoc Linking Test"/> - <contents name="link-targets" title="Link targets" level="1"/> - <description> - <relation href="toc.html" type="page" meta="next" description="Table of Contents"/> - <relation href="qdoctests-qdocfileoutput.html" type="page" meta="previous" description="Testing QDoc output from .qdoc files"/> - <brief>This is a page for testing QDoc's link command.</brief> - <target name="link-test-target"/> - <section id="link-targets"> - <heading level="1">Link targets</heading> - <para>Valid parameters for the link command (<teletype type="highlighted">\l</teletype>) are page and section titles, targets defined with \target or \keyword commands, and API reference keywords (types, methods, namespaces, and so on).</para> - </section> - </description> - </page> - </document> -</WebXML> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput.webxml b/tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput.webxml deleted file mode 100644 index 33f3c5879..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput.webxml +++ /dev/null @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<WebXML> - <document> - <page name="qdoctests-qdocfileoutput.html" href="qdoctests-qdocfileoutput.html" status="active" location="qdoctests-outputfromqdocfiles.qdoc" documented="true" subtype="page" title="Testing QDoc output from .qdoc files" fulltitle="Testing QDoc output from .qdoc files" subtitle="" brief="This is a simple page for testing purposes only"> - <contents name="supported-file-types" title="Supported file types" level="1"/> - <contents name="further-information" title="Further information" level="1"/> - <contents name="linking" title="Linking" level="1"/> - <description> - <relation href="qdoctests-qdocfileoutput-linking.html" type="page" meta="next" description="Testing QDoc's link command"/> - <brief>This is a simple page for testing purposes only.</brief> - <para>QDoc generates documentation for software projects. It does this by extracting <italic>QDoc comments</italic> from project source files. QDoc comments are signified by a C-style-like comment tag followed by an exclamation point, like this: <teletype type="highlighted">/*!</teletype> <teletype type="highlighted">This text is contained within QDoc comment tags.</teletype> <teletype type="highlighted">*/</teletype>.</para> - <section id="supported-file-types"> - <heading level="1">Supported file types</heading> - <para>QDoc parses <teletype type="highlighted">.cpp</teletype> and <teletype type="highlighted">.qdoc</teletype> files. It does extract comments from header (<teletype type="highlighted">.h</teletype>) files.</para> - </section> - <section id="further-information"> - <heading level="1">Further information</heading> - <para>This test document is written with the purpose of testing the output QDoc generates when parsing <teletype type="highlighted">.qdoc</teletype> files. It is fairly simple and makes use of a limited subset of QDoc's command. Those commands are:</para> - <list type="bullet"> - <item> - <para> - <teletype type="highlighted">\page</teletype></para> - </item> - <item> - <para> - <teletype type="highlighted">\title</teletype></para> - </item> - <item> - <para> - <teletype type="highlighted">\brief</teletype></para> - </item> - <item> - <para> - <teletype type="highlighted">\e</teletype> (for emphasizing "QDoc comments")</para> - </item> - <item> - <para> - <teletype type="highlighted">\c</teletype> (for multiple monospace-formatted entries)</para> - </item> - <item> - <para> - <teletype type="highlighted">\section1</teletype></para> - </item> - <item> - <para> - <teletype type="highlighted">\list</teletype></para> - </item> - <item> - <para> - <teletype type="highlighted">\li</teletype></para> - </item> - <item> - <para> - <teletype type="highlighted">\endlist</teletype></para> - </item> - </list> - </section> - <section id="linking"> - <heading level="1">Linking</heading> - <para>There are multiple ways to create hyperlinks to other topics:</para> - <list type="bullet"> - <item> - <para> - <link raw="Testing QDoc's link command" href="qdoctests-qdocfileoutput-linking.html" type="page" page="Testing QDoc's link command">Linking to a page title</link></para> - </item> - <item> - <para> - <link raw="Link targets" href="qdoctests-qdocfileoutput-linking.html#link-targets" type="page" page="Testing QDoc's link command">Linking to a section title</link></para> - </item> - <item> - <para> - <link raw="link-test-target" href="qdoctests-qdocfileoutput-linking.html#link-test-target" type="page" page="Testing QDoc's link command">Linking using a \target string</link></para> - </item> - <item> - <para> - <link raw="QDoc Linking Test" href="qdoctests-qdocfileoutput-linking.html" type="page" page="Testing QDoc's link command">Linking using a \keyword string</link></para> - </item> - </list> - </section> - </description> - </page> - </document> -</WebXML> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/second.webxml b/tests/auto/qdoc/generatedoutput/expected_output/html/second.webxml deleted file mode 100644 index 9ecd3c2fe..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/html/second.webxml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<WebXML> - <document> - <class name="Second" href="second.html" status="active" access="public" location="ccc.h" documented="true" module="TestModule"> - <description> - <para>This is a second class</para> - </description> - </class> - </document> -</WebXML> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/test-componentset-example.webxml b/tests/auto/qdoc/generatedoutput/expected_output/html/test-componentset-example.webxml deleted file mode 100644 index 600f2f3ed..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/html/test-componentset-example.webxml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<WebXML> - <document> - <page name="componentset" href="test-componentset-example.html" status="active" location="examples.qdoc" documented="true" subtype="example" title="QML Documentation Example" fulltitle="QML Documentation Example" subtitle="" brief="Example for documenting QML types"> - <contents name="qml-class" title="QML Class" level="1"/> - <contents name="properties-signals-handlers-and-methods" title="Properties, Signals, Handlers, and Methods" level="1"/> - <contents name="internal-documentation" title="Internal Documentation" level="2"/> - <contents name="qml-types-with-c-implementation" title="QML Types with C++ Implementation" level="1"/> - <description> - <brief>Example for documenting QML types.</brief> - <para>This example demonstrates one of the ways to document QML types. It also generates a warning about a missing example image, on purpose.</para> - <para>In particular, there are sample types that are documented with QDoc commands comments. There are documentation comments for the QML types and their public interfaces. The types are grouped into a module, the <link raw="UI Components" href="uicomponents-qmlmodule.html" type="">UI Components</link> module.</para> - <para>The uicomponents.qdoc file generates the overview page for the <link raw="UI Components" href="uicomponents-qmlmodule.html" type="">UI Components</link> module page.</para> - <para>The generated documentation is available in the <link raw="UI Components" href="uicomponents-qmlmodule.html" type="">UI Components</link> module.</para> - <section id="qml-class"> - <heading level="1">QML Class</heading> - <para>The QML types use the \qmltype to document the type. In addition, they have the \inmodule command in order for QDoc to associate them to the <teletype type="highlighted">UIComponents</teletype> module.</para> - <para>QDoc uses the \brief command to place a basic description when listing the types.</para> - </section> - <section id="properties-signals-handlers-and-methods"> - <heading level="1">Properties, Signals, Handlers, and Methods</heading> - <para>The types have their properties, signals, handlers, and methods defined in their respective QML files. QDoc associates the properties and methods to the types, therefore, you only need to place the documentation above the property, method, or signal.</para> - <para>To document the type of a <italic>property alias</italic>, you must use the \qmlproperty command to specify the data type.</para> - <code>\qmlproperty int anAliasedProperty -An aliased property of type int.</code> - </section> - <section id="internal-documentation"> - <heading level="2">Internal Documentation</heading> - <para>You may declare that a documentation is for internal use by placing the \internal command after the beginning QDoc comment <teletype type="highlighted">/*</teletype>. QDoc will prevent the internal documentation from appearing in the public API.</para> - <para>If you wish to omit certain parts of the documentation, you may use the \omit and \endomit command.</para> - </section> - <section id="qml-types-with-c-implementation"> - <heading level="1">QML Types with C++ Implementation</heading> - <para>This example only demonstrates the documentation for types in QML files, but the regular QML commands may be placed inside C++ classes to define the public API of the QML type.</para> - </section> - <para>Files:</para> - <list type="bullet"> - <item> - <para> - <link raw="componentset/ProgressBar.qml" href="test-componentset-progressbar-qml.html" type="page" page="ProgressBar.qml Example File">componentset/ProgressBar.qml</link> - </para> - </item> - <item> - <para> - <link raw="componentset/Switch.qml" href="test-componentset-switch-qml.html" type="page" page="Switch.qml Example File">componentset/Switch.qml</link> - </para> - </item> - <item> - <para> - <link raw="componentset/TabWidget.qml" href="test-componentset-tabwidget-qml.html" type="page" page="TabWidget.qml Example File">componentset/TabWidget.qml</link> - </para> - </item> - <item> - <para> - <link raw="componentset/componentset.pro" href="test-componentset-componentset-pro.html" type="page" page="componentset.pro Example File">componentset/componentset.pro</link> - </para> - </item> - <item> - <para> - <link raw="componentset/componentset.qml" href="test-componentset-componentset-qml.html" type="page" page="componentset.qml Example File">componentset/componentset.qml</link> - </para> - </item> - </list> - </description> - </page> - </document> -</WebXML> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/test-nover-qmlmodule.webxml b/tests/auto/qdoc/generatedoutput/expected_output/html/test-nover-qmlmodule.webxml deleted file mode 100644 index 5d24b3077..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/html/test-nover-qmlmodule.webxml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<WebXML> - <document/> -</WebXML> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/testcpp-module.webxml b/tests/auto/qdoc/generatedoutput/expected_output/html/testcpp-module.webxml deleted file mode 100644 index 5d24b3077..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/html/testcpp-module.webxml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<WebXML> - <document/> -</WebXML> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/testqdoc-test.webxml b/tests/auto/qdoc/generatedoutput/expected_output/html/testqdoc-test.webxml deleted file mode 100644 index a647f1c0c..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/html/testqdoc-test.webxml +++ /dev/null @@ -1,98 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<WebXML> - <document> - <class name="Test" fullname="TestQDoc::Test" href="testqdoc-test.html" status="active" access="public" location="testcpp.h" documented="true" groups="testgroup" module="TestCPP" brief="A class in a namespace"> - <description> - <brief>A class in a namespace.</brief> - </description> - <function name="QDOCTEST_MACRO2" href="testqdoc-test.html#QDOCTEST_MACRO2" status="active" access="public" documented="true" related="1" since="Test 1.1" meta="macrowithparams" virtual="non" const="false" static="false" final="false" override="false" type="" brief="A macro with argument x" signature="QDOCTEST_MACRO2(int &x)" groups="testgroup"> - <parameter type="int &" name="x" default=""/> - <description> - <brief>A macro with argument <argument>x</argument>.</brief> - </description> - </function> - <function name="Test" fullname="TestQDoc::Test::Test" href="testqdoc-test.html#Test" status="active" access="public" documented="true" meta="constructor" virtual="non" const="false" static="false" final="false" override="false" type="" signature="Test()"> - <description> - <para>Default constructor.</para> - </description> - </function> - <function name="anotherObsoleteMember" fullname="TestQDoc::Test::anotherObsoleteMember" href="testqdoc-test-obsolete.html#anotherObsoleteMember" status="deprecated" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" signature="void anotherObsoleteMember()"> - <description> - <para>Use <link raw="obsoleteMember()" href="testqdoc-test.html#obsoleteMember" type="function">obsoleteMember()</link> instead.</para> - </description> - </function> - <function name="deprecatedMember" fullname="TestQDoc::Test::deprecatedMember" href="testqdoc-test-obsolete.html#deprecatedMember" status="deprecated" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" signature="void deprecatedMember()"> - <description> - <para>Use <link raw="someFunction()" href="testqdoc-test.html#someFunction" type="function">someFunction()</link> instead.</para> - </description> - </function> - <function name="funcPtr" fullname="TestQDoc::Test::funcPtr" href="testqdoc-test.html#funcPtr" status="active" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void (*)(bool)" signature="void (*)(bool) funcPtr(bool b, const char *s)"> - <parameter type="bool" name="b" default=""/> - <parameter type="const char *" name="s" default=""/> - <description> - <para>Returns a pointer to a function that takes a boolean. Uses <argument>b</argument> and <argument>s</argument>.</para> - </description> - </function> - <function name="inlineFunction" fullname="TestQDoc::Test::inlineFunction" href="testqdoc-test.html#inlineFunction" status="active" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" brief="An inline function, documented using the \fn QDoc command" signature="void inlineFunction()"> - <description> - <brief>An inline function, documented using the \fn QDoc command.</brief> - </description> - </function> - <function name="obsoleteMember" fullname="TestQDoc::Test::obsoleteMember" href="testqdoc-test-obsolete.html#obsoleteMember" status="deprecated" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" signature="void obsoleteMember()"> - <description> - <para>Use <link raw="someFunction()" href="testqdoc-test.html#someFunction" type="function">someFunction()</link> instead.</para> - </description> - </function> - <function name="operator++" fullname="TestQDoc::Test::operator++" href="testqdoc-test-obsolete.html#operator-2b-2b" status="deprecated" access="public" location="testcpp.h" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="TestQDoc::Test &" signature="TestQDoc::Test & operator++()"> - <description/> - </function> - <function name="operator--" fullname="TestQDoc::Test::operator--" href="testqdoc-test-obsolete.html#operator--" status="deprecated" access="public" location="testcpp.h" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="TestQDoc::Test &" signature="TestQDoc::Test & operator--()"> - <description/> - </function> - <function name="operator=" fullname="TestQDoc::Test::operator=" href="testqdoc-test.html#operator-eq" status="active" access="public" documented="true" meta="move-assign" virtual="non" const="false" static="false" final="false" override="false" type="TestQDoc::Test &" signature="TestQDoc::Test & operator=(TestQDoc::Test &&other)"> - <parameter type="TestQDoc::Test &&" name="other" default=""/> - <description> - <para>Move-assigns <argument>other</argument>.</para> - </description> - </function> - <function name="operator==" href="testqdoc-test.html#operator-eq-eq" status="active" access="public" location="testcpp.h" documented="true" related="2" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="bool" signature="bool operator==(const TestQDoc::Test &lhs, const TestQDoc::Test &rhs)"> - <parameter type="const TestQDoc::Test &" name="lhs" default=""/> - <parameter type="const TestQDoc::Test &" name="rhs" default=""/> - <description> - <para>Returns true if <argument>lhs</argument> and <argument>rhs</argument> are equal.</para> - </description> - </function> - <function name="overload" fullname="TestQDoc::Test::overload" href="testqdoc-test.html#overload" status="active" access="protected" location="testcpp.h" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" signature="void overload()"> - <description/> - </function> - <function name="overload" fullname="TestQDoc::Test::overload" href="testqdoc-test.html#overload-1" status="active" access="protected" location="testcpp.h" documented="true" since="Test 1.2" meta="plain" virtual="non" const="false" static="false" final="false" override="false" overload="true" overload-number="1" type="void" signature="void overload(bool b)"> - <parameter type="bool" name="b" default=""/> - <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, int v)"> - <parameter type="int" name="" 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> - </function> - <function name="someFunctionDefaultArg" fullname="TestQDoc::Test::someFunctionDefaultArg" href="testqdoc-test.html#someFunctionDefaultArg" status="active" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" signature="void someFunctionDefaultArg(int i, bool b)" groups="testgroup"> - <parameter type="int" name="i" default=""/> - <parameter type="bool" name="b" default="false"/> - <description> - <para>Function that takes a parameter <argument>i</argument> and <argument>b</argument>.</para> - </description> - </function> - <function name="virtualFun" fullname="TestQDoc::Test::virtualFun" href="testqdoc-test.html#virtualFun" status="active" access="public" location="testcpp.h" documented="true" meta="plain" virtual="virtual" const="false" static="false" final="false" override="false" type="void" signature="void virtualFun()"> - <description> - <para>Function that must be reimplemented.</para> - </description> - </function> - <typedef name="SomeType" fullname="TestQDoc::Test::SomeType" href="testqdoc-test.html#SomeType-typedef" status="active" access="public" location="testcpp.h" documented="true"> - <description> - <brief>A typedef.</brief> - </description> - </typedef> - </class> - </document> -</WebXML> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/testqdoc-testderived.webxml b/tests/auto/qdoc/generatedoutput/expected_output/html/testqdoc-testderived.webxml deleted file mode 100644 index fd498be6f..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/html/testqdoc-testderived.webxml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<WebXML> - <document> - <class name="TestDerived" fullname="TestQDoc::TestDerived" href="testqdoc-testderived.html" status="active" access="public" location="testcpp.h" documented="true" bases="TestQDoc::Test" module="TestCPP" brief="A derived class in a namespace"> - <description> - <brief>A derived class in a namespace.</brief> - </description> - <function name="staticObsoleteMember" fullname="TestQDoc::TestDerived::staticObsoleteMember" href="testqdoc-testderived-obsolete.html#staticObsoleteMember" status="deprecated" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="true" final="false" override="false" type="void" signature="void staticObsoleteMember()"> - <description> - <para>Static obsolete method.</para> - </description> - </function> - <function name="virtualFun" fullname="TestQDoc::TestDerived::virtualFun" href="testqdoc-testderived.html#virtualFun" status="active" access="public" location="testcpp.h" documented="true" meta="plain" virtual="virtual" const="false" static="false" final="false" override="true" type="void" signature="void virtualFun() override"> - <description/> - </function> - <typedef name="DerivedType" fullname="TestQDoc::TestDerived::DerivedType" href="testqdoc-testderived.html#DerivedType-typedef" status="active" access="public" location="testcpp.h" documented="true" aliasedtype="Test::SomeType"> - <description> - <para>An aliased typedef.</para> - </description> - </typedef> - <typedef name="NotTypedef" fullname="TestQDoc::TestDerived::NotTypedef" href="testqdoc-testderived.html#NotTypedef-typedef" status="active" access="public" location="testcpp.h" documented="true" aliasedtype="int"> - <description> - <para>I'm an alias, not a typedef.</para> - </description> - </typedef> - </class> - </document> -</WebXML> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/third.webxml b/tests/auto/qdoc/generatedoutput/expected_output/html/third.webxml deleted file mode 100644 index 529ffd896..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/html/third.webxml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<WebXML> - <document> - <class name="Third" href="third.html" status="active" access="public" location="aaa.h" documented="true" module="TestModule"> - <description> - <para>This is a third class</para> - </description> - </class> - </document> -</WebXML> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/uicomponents-qmlmodule.webxml b/tests/auto/qdoc/generatedoutput/expected_output/html/uicomponents-qmlmodule.webxml deleted file mode 100644 index 5d24b3077..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/html/uicomponents-qmlmodule.webxml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<WebXML> - <document/> -</WebXML> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc-test.html b/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc-test.html deleted file mode 100644 index 58b61d1db..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc-test.html +++ /dev/null @@ -1,130 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testcpp.cpp --> - <title>Test Class | TestCPP</title> -</head> -<body> -<li>Test</li> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#public-types">Public Types</a></li> -<li class="level1"><a href="#public-functions">Public Functions</a></li> -<li class="level1"><a href="#protected-functions">Protected Functions</a></li> -<li class="level1"><a href="#related-non-members">Related Non-Members</a></li> -<li class="level1"><a href="#macros">Macros</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Test Class</h1> -<span class="small-subtitle">class <a href="testqdoc.html">TestQDoc</a>::Test</span> -<!-- $$$Test-brief --> -<p>A class in a namespace. <a href="#details">More...</a></p> -<!-- @@@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><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> -<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> -<h2 id="public-types">Public Types</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#SomeType-typedef">SomeType</a></b></td></tr> -</table></div> -<h2 id="public-functions">Public Functions</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#Test">Test</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> TestQDoc::Test &</td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#operator-eq">operator=</a></b>(TestQDoc::Test &&<i>other</i>)</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void (*)(bool) </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#funcPtr">funcPtr</a></b>(bool <i>b</i>, const char *<i>s</i>)</td></tr> -<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, int <i>v</i> = 0)</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> -<tr><td class="memItemLeft rightAlign topAlign"> virtual void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#virtualFun">virtualFun</a></b>()</td></tr> -</table></div> -<h2 id="protected-functions">Protected 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#overload">overload</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#overload-1">overload</a></b>(bool <i>b</i>)</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"> bool </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#operator-eq-eq">operator==</a></b>(const TestQDoc::Test &<i>lhs</i>, const TestQDoc::Test &<i>rhs</i>)</td></tr> -</table></div> -<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> -</table></div> -<!-- $$$Test-description --> -<div class="descr"> -<h2 id="details">Detailed Description</h2> -</div> -<!-- @@@Test --> -<div class="types"> -<h2>Member Type Documentation</h2> -<!-- $$$SomeType --> -<h3 class="fn" id="SomeType-typedef">Test::<span class="name">SomeType</span></h3> -<p>A typedef.</p> -<!-- @@@SomeType --> -</div> -<div class="func"> -<h2>Member Function Documentation</h2> -<!-- $$$ --> -<div class="fngroup"> -<h3 class="fn fngroupitem" id="overload"><code>[protected] </code><span class="type">void</span> Test::<span class="name">overload</span>()</h3><h3 class="fn fngroupitem" id="overload-1"><code>[protected, since Test 1.2] </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> -<!-- @@@ --> -<!-- $$$Test[overload1]$$$Test --> -<h3 class="fn" id="Test"><code>[default] </code>Test::<span class="name">Test</span>()</h3> -<p>Default constructor.</p> -<!-- @@@Test --> -<!-- $$$operator=[overload1]$$$operator=TestQDoc::Test&& --> -<h3 class="fn" id="operator-eq"><code>[default] </code><span class="type"><a href="testqdoc-test.html">TestQDoc::Test</a></span> &Test::<span class="name">operator=</span>(<span class="type"><a href="testqdoc-test.html">TestQDoc::Test</a></span> &&<i>other</i>)</h3> -<p>Move-assigns <i>other</i>.</p> -<!-- @@@operator= --> -<!-- $$$funcPtr[overload1]$$$funcPtrboolconstchar* --> -<h3 class="fn" id="funcPtr"><span class="type">void</span> (*)(<span class="type">bool</span>) Test::<span class="name">funcPtr</span>(<span class="type">bool</span> <i>b</i>, const <span class="type">char</span> *<i>s</i>)</h3> -<p>Returns a pointer to a function that takes a boolean. Uses <i>b</i> and <i>s</i>.</p> -<!-- @@@funcPtr --> -<!-- $$$inlineFunction[overload1]$$$inlineFunction --> -<h3 class="fn" id="inlineFunction"><span class="type">void</span> Test::<span class="name">inlineFunction</span>()</h3> -<p>An inline function, documented using the \fn QDoc command.</p> -<!-- @@@inlineFunction --> -<!-- $$$someFunction[overload1]$$$someFunctionintint --> -<h3 class="fn" id="someFunction"><code>[since Test 1.0] </code><span class="type">int</span> Test::<span class="name">someFunction</span>(<span class="type">int</span>, <span class="type">int</span> <i>v</i> = 0)</h3> -<p>Function that takes a parameter <i>v</i>. Also returns the value of <i>v</i>.</p> -<p>This function was introduced in Test 1.0.</p> -<!-- @@@someFunction --> -<!-- $$$someFunctionDefaultArg[overload1]$$$someFunctionDefaultArgintbool --> -<h3 class="fn" id="someFunctionDefaultArg"><code>[since 2.0] </code><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> -<p>This function was introduced in Qt 2.0.</p> -<!-- @@@someFunctionDefaultArg --> -<!-- $$$virtualFun[overload1]$$$virtualFun --> -<h3 class="fn" id="virtualFun"><code>[virtual] </code><span class="type">void</span> Test::<span class="name">virtualFun</span>()</h3> -<p>Function that must be reimplemented.</p> -<!-- @@@virtualFun --> -</div> -<div class="relnonmem"> -<h2>Related Non-Members</h2> -<!-- $$$operator==[overload1]$$$operator==constTestQDoc::Test&constTestQDoc::Test& --> -<h3 class="fn" id="operator-eq-eq"><span class="type">bool</span> <span class="name">operator==</span>(const <span class="type"><a href="testqdoc-test.html">TestQDoc::Test</a></span> &<i>lhs</i>, const <span class="type"><a href="testqdoc-test.html">TestQDoc::Test</a></span> &<i>rhs</i>)</h3> -<p>Returns true if <i>lhs</i> and <i>rhs</i> are equal.</p> -<!-- @@@operator== --> -</div> -<div class="macros"> -<h2>Macro Documentation</h2> -<!-- $$$QDOCTEST_MACRO2[overload1]$$$QDOCTEST_MACRO2int& --> -<h3 class="fn" id="QDOCTEST_MACRO2"><code>[since Test 1.1] </code><span class="name">QDOCTEST_MACRO2</span>(<span class="type">int</span> &<i>x</i>)</h3> -<p>A macro with argument <i>x</i>.</p> -<p>This function was introduced in Test 1.1.</p> -<!-- @@@QDOCTEST_MACRO2 --> -</div> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html b/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html deleted file mode 100644 index 289712177..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html +++ /dev/null @@ -1,60 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testcpp.cpp --> - <title>TestQDoc Namespace | TestCPP</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#classes">Classes</a></li> -<li class="level1"><a href="#macros">Macros</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -<li class="level2"><a href="#usage">Usage</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">TestQDoc Namespace</h1> -<!-- $$$TestQDoc-brief --> -<p>A namespace. <a href="#details">More...</a></p> -<!-- @@@TestQDoc --> -<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> -<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> -<tr><td class="memItemLeft rightAlign topAlign"> class </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html">TestDerived</a></b></td></tr> -</table></div> -<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.html#QDOCTEST_MACRO">QDOCTEST_MACRO</a></b></td></tr> -</table></div> -<!-- $$$TestQDoc-description --> -<div class="descr"> -<h2 id="details">Detailed Description</h2> -<h3 id="usage">Usage</h3> -<p>This namespace is for testing QDoc output.</p> -</div> -<!-- @@@TestQDoc --> -<div class="classes"> -<h2>Classes</h2> -<h3> class <a href="testqdoc-test.html">Test</a></h3><!-- $$$Test-brief --> -<p>A class in a namespace. <a href="testqdoc-test.html#details">More...</a></p> -<!-- @@@Test --> -<h3> class <a href="testqdoc-testderived.html">TestDerived</a></h3><!-- $$$TestDerived-brief --> -<p>A derived class in a namespace. <a href="testqdoc-testderived.html#details">More...</a></p> -<!-- @@@TestDerived --> -</div> -<div class="macros"> -<h2>Macro Documentation</h2> -<!-- $$$QDOCTEST_MACRO[overload1]$$$QDOCTEST_MACRO --> -<h3 class="fn" id="QDOCTEST_MACRO"><span class="name">QDOCTEST_MACRO</span></h3> -<!-- @@@QDOCTEST_MACRO --> -</div> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/index.html b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/index.html deleted file mode 100644 index 33e984136..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/index.html +++ /dev/null @@ -1,27 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- includefromparent.qdoc --> - <title>doc index | Test</title> -</head> -<body> -<h1 class="title">doc index</h1> -<!-- $$$index.html-description --> -<div class="descr" id="details"> -<h2 id="c-classes">C++ Classes</h2> -<div class="table"><table class="annotated"> -<tr class="odd topAlign"><td class="tblName"><p><a href="testqdoc-test.html">TestQDoc::Test</a></p></td><td class="tblDescr"><p>A class in a namespace</p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p></td><td class="tblDescr"><p>A derived class in a namespace</p></td></tr> -</table></div> -<h2 id="qml-types">QML Types</h2> -<div class="table"><table class="annotated"> -<tr class="odd topAlign"><td class="tblName"><p><a href="qml-qdoc-test-abstractparent.html">AbstractParent</a></p></td><td class="tblDescr"><p>Abstract base QML type</p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="qml-qdoc-test-child.html">Child</a></p></td><td class="tblDescr"><p>A Child inheriting its parent</p></td></tr> -<tr class="odd topAlign"><td class="tblName"><p><a href="qml-int.html">int</a></p></td><td class="tblDescr"><p>An integer basic type</p></td></tr> -</table></div> -<p>Test include file that is part of the sourcedirs.</p> -</div> -<!-- @@@index.html --> -</body> -</html> 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 deleted file mode 100644 index 1ca034caf..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent-members.html +++ /dev/null @@ -1,17 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- includefromparent.qdoc --> - <title>List of All Members for AbstractParent | Test</title> -</head> -<body> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<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><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 deleted file mode 100644 index 0c11a6711..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent.html +++ /dev/null @@ -1,65 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- includefromparent.qdoc --> - <title>AbstractParent QML Type | Test</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#properties">Properties</a></li> -<li class="level1"><a href="#methods">Methods</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">AbstractParent QML Type</h1> -<!-- $$$AbstractParent-brief --> -<p>Abstract base QML type. <a href="#details">More...</a></p> -<!-- @@@AbstractParent --> -<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"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="qml-qdoc-test-child.html">Child</a></p> -</td></tr></table></div><ul> -<li><a href="qml-qdoc-test-abstractparent-members.html">List of all members, including inherited members</a></li> -</ul> -<h2 id="properties">Properties</h2> -<ul> -<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><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> -<p>Test include file that is part of the sourcedirs.</p> -<!-- @@@AbstractParent --> -<h2>Property Documentation</h2> -<!-- $$$children --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -<p>Test include file that is part of the sourcedirs.</p> -</div></div><!-- @@@children --> -<br/> -<h2>Method Documentation</h2> -<!-- $$$rear[overload1]$$$rearChild --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -<p>Test include file that is part of the sourcedirs.</p> -</div></div><!-- @@@rear --> -<br/> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/index-linking.html b/tests/auto/qdoc/generatedoutput/expected_output/index-linking.html deleted file mode 100644 index 600d6d4e6..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/index-linking.html +++ /dev/null @@ -1,27 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- linking.qdoc --> - <title>Linking | IndexLinking</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#qml-properties">QML properties</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Linking</h1> -<!-- $$$index-linking.html-description --> -<div class="descr" id="details"> -<h2 id="qml-properties">QML properties</h2> -<ol class="A" type="A"><li>Property group: <a href="qml-qdoc-test-parent.html#group-prop">Parent::group</a>.</li> -<li>Property in a group: <a href="qml-qdoc-test-parent.html#group.c-prop">QDoc.Test::Parent::group.c</a>.</li> -</ol> -</div> -<!-- @@@index-linking.html --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/index.html b/tests/auto/qdoc/generatedoutput/expected_output/index.html deleted file mode 100644 index 4593e3419..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/index.html +++ /dev/null @@ -1,21 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- index.qdoc --> - <title>doc index | TestModule</title> -</head> -<body> -<h1 class="title">doc index</h1> -<!-- $$$index.html-description --> -<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.html">First::Nested</a></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> -</div> -<!-- @@@index.html --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/nestedmacro/testcpp-module.html b/tests/auto/qdoc/generatedoutput/expected_output/nestedmacro/testcpp-module.html deleted file mode 100644 index 4bc14d345..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/nestedmacro/testcpp-module.html +++ /dev/null @@ -1,43 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testcpp.cpp --> - <title>QDoc Test C++ Classes | TestCPP</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#namespaces">Namespaces</a></li> -<li class="level1"><a href="#classes">Classes</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">QDoc Test C++ Classes</h1> -<!-- $$$TestCPP-brief --> -<p>A test module page. <a href="#details">More...</a></p> -<!-- @@@TestCPP --> -<h2 id="namespaces">Namespaces</h2> -<div class="table"><table class="annotated"> -<tr class="odd topAlign"><td class="tblName"><p><a href="crossmoduleref.html">CrossModuleRef</a></p></td><td class="tblDescr"><p>Namespace that has documented functions in multiple modules</p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="testqdoc.html">TestQDoc</a></p></td><td class="tblDescr"><p>A namespace</p></td></tr> -</table></div> -<h2 id="classes">Classes</h2> -<div class="table"><table class="annotated"> -<tr class="odd topAlign"><td class="tblName"><p><a href="testqdoc-test.html">TestQDoc::Test</a></p></td><td class="tblDescr"><p>A class in a namespace</p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p></td><td class="tblDescr"><p>A derived class in a namespace</p></td></tr> -</table></div> -<!-- $$$TestCPP-description --> -<div class="descr"> -<h2 id="details">Detailed Description</h2> -<div class="admonition note"> -<p><b>Note: </b>This is just a test.</p> -</div> -<p><b>This module was introduced in version 5.15.</b></p> -</div> -<!-- @@@TestCPP --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/noautolist-docbook/qdoc-test-qmlmodule.xml b/tests/auto/qdoc/generatedoutput/expected_output/noautolist-docbook/qdoc-test-qmlmodule.xml deleted file mode 100644 index 73a5f9653..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/noautolist-docbook/qdoc-test-qmlmodule.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>QDoc.Test QML Module</db:title> -<db:productname>Test</db:productname> -<db:titleabbrev>A test project for QDoc build artifacts</db:titleabbrev> -<db:abstract> -<db:para>QML Types for the Test module.</db:para> -<db:para><db:emphasis role="bold">This module is under development and is subject to change.</db:emphasis></db:para> -<db:para>This module was introduced in Qt 1.1.</db:para> -</db:abstract> -</db:info> -<db:para><db:emphasis role="bold">This module is under development and is subject to change.</db:emphasis></db:para> -<db:para>This module was introduced in Qt 1.1.</db:para> -<db:anchor xml:id="details"/> -</db:article> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/noautolist-docbook/test-componentset-example.xml b/tests/auto/qdoc/generatedoutput/expected_output/noautolist-docbook/test-componentset-example.xml deleted file mode 100644 index 062d7cdf0..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/noautolist-docbook/test-componentset-example.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>QML Documentation Example</db:title> -<db:productname>Test</db:productname> -<db:titleabbrev>A test project for QDoc build artifacts</db:titleabbrev> -<db:abstract> -<db:para>Example for documenting QML types.</db:para> -</db:abstract> -</db:info> -<db:para>This example demonstrates one of the ways to document QML types. It also generates a warning about a missing example image, on purpose.</db:para> -<db:para>In particular, there are sample types that are documented with QDoc commands comments. There are documentation comments for the QML types and their public interfaces. The types are grouped into a module, the <db:link xlink:href="uicomponents-qmlmodule.xml">UI Components</db:link> module.</db:para> -<db:para>The uicomponents.qdoc file generates the overview page for the <db:link xlink:href="uicomponents-qmlmodule.xml">UI Components</db:link> module page.</db:para> -<db:para>The generated documentation is available in the <db:link xlink:href="uicomponents-qmlmodule.xml">UI Components</db:link> module.</db:para> -<db:section xml:id="qml-class"> -<db:title>QML Class</db:title> -<db:para>The QML types use the \qmltype to document the type. In addition, they have the \inmodule command in order for QDoc to associate them to the <db:code>UIComponents</db:code> module.</db:para> -<db:para>QDoc uses the \brief command to place a basic description when listing the types.</db:para> -</db:section> -<db:section xml:id="properties-signals-handlers-and-methods"> -<db:title>Properties, Signals, Handlers, and Methods</db:title> -<db:para>The types have their properties, signals, handlers, and methods defined in their respective QML files. QDoc associates the properties and methods to the types, therefore, you only need to place the documentation above the property, method, or signal.</db:para> -<db:para>To document the type of a <db:emphasis>property alias</db:emphasis>, you must use the \qmlproperty command to specify the data type.</db:para> -<db:programlisting language="cpp">\qmlproperty <@type>int</@type> anAliasedProperty -An aliased property of type <@type>int</@type><@op>.</@op> -</db:programlisting> -<db:section xml:id="internal-documentation"> -<db:title>Internal Documentation</db:title> -<db:para>You may declare that a documentation is for internal use by placing the \internal command after the beginning QDoc comment <db:code>/*</db:code>. QDoc will prevent the internal documentation from appearing in the public API.</db:para> -<db:para>If you wish to omit certain parts of the documentation, you may use the \omit and \endomit command.</db:para> -</db:section> -</db:section> -<db:section xml:id="qml-types-with-c-implementation"> -<db:title>QML Types with C++ Implementation</db:title> -<db:para>This example only demonstrates the documentation for types in QML files, but the regular QML commands may be placed inside C++ classes to define the public API of the QML type.</db:para> -</db:section> -</db:article> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/noautolist-docbook/testcpp-module.xml b/tests/auto/qdoc/generatedoutput/expected_output/noautolist-docbook/testcpp-module.xml deleted file mode 100644 index 33ceec53c..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/noautolist-docbook/testcpp-module.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>QDoc Test C++ Classes</db:title> -<db:productname>Test</db:productname> -<db:titleabbrev>A test project for QDoc build artifacts</db:titleabbrev> -<db:abstract> -<db:para>A test module page.</db:para> -</db:abstract> -</db:info> -<db:para>A test module page.</db:para> -<db:section xml:id="details"> -<db:title>Detailed Description</db:title> -<db:note> -<db:para>This is just a test.</db:para> -</db:note> -</db:section> -</db:article> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/qdoc-test-qmlmodule.html b/tests/auto/qdoc/generatedoutput/expected_output/noautolist/qdoc-test-qmlmodule.html deleted file mode 100644 index 8ae6022c0..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/qdoc-test-qmlmodule.html +++ /dev/null @@ -1,18 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- type.cpp --> - <title>QDoc.Test QML Module | Test</title> -</head> -<body> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">QDoc.Test QML Module</h1> -<p><b>This module is under development and is subject to change.</b></p> -<p>This module was introduced in Qt 1.1.</p> -<!-- $$$QDoc.Test-description --> -<div class="descr" id="details"> -</div> -<!-- @@@QDoc.Test --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/test-componentset-example.html b/tests/auto/qdoc/generatedoutput/expected_output/noautolist/test-componentset-example.html deleted file mode 100644 index 2d77b7bf1..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/test-componentset-example.html +++ /dev/null @@ -1,46 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- examples.qdoc --> - <title>QML Documentation Example | Test</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#qml-class">QML Class</a></li> -<li class="level1"><a href="#properties-signals-handlers-and-methods">Properties, Signals, Handlers, and Methods</a></li> -<li class="level2"><a href="#internal-documentation">Internal Documentation</a></li> -<li class="level1"><a href="#qml-types-with-c-implementation">QML Types with C++ Implementation</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">QML Documentation Example</h1> -<!-- $$$componentset-brief --> -<p>Example for documenting QML types.</p> -<!-- @@@componentset --> -<!-- $$$componentset-description --> -<div class="descr" id="details"> -<p>This example demonstrates one of the ways to document QML types. It also generates a warning about a missing example image, on purpose.</p> -<p>In particular, there are sample types that are documented with QDoc commands comments. There are documentation comments for the QML types and their public interfaces. The types are grouped into a module, the <a href="uicomponents-qmlmodule.html">UI Components</a> module.</p> -<p>The uicomponents.qdoc file generates the overview page for the <a href="uicomponents-qmlmodule.html">UI Components</a> module page.</p> -<p>The generated documentation is available in the <a href="uicomponents-qmlmodule.html">UI Components</a> module.</p> -<h4 id="qml-class">QML Class</h4> -<p>The QML types use the \qmltype to document the type. In addition, they have the \inmodule command in order for QDoc to associate them to the <code>UIComponents</code> module.</p> -<p>QDoc uses the \brief command to place a basic description when listing the types.</p> -<h4 id="properties-signals-handlers-and-methods">Properties, Signals, Handlers, and Methods</h4> -<p>The types have their properties, signals, handlers, and methods defined in their respective QML files. QDoc associates the properties and methods to the types, therefore, you only need to place the documentation above the property, method, or signal.</p> -<p>To document the type of a <i>property alias</i>, you must use the \qmlproperty command to specify the data type.</p> -<pre class="cpp">\qmlproperty <span class="type">int</span> anAliasedProperty -An aliased property of type <span class="type">int</span><span class="operator">.</span></pre> -<h5 id="internal-documentation">Internal Documentation</h5> -<p>You may declare that a documentation is for internal use by placing the \internal command after the beginning QDoc comment <code>/*</code>. QDoc will prevent the internal documentation from appearing in the public API.</p> -<p>If you wish to omit certain parts of the documentation, you may use the \omit and \endomit command.</p> -<h4 id="qml-types-with-c-implementation">QML Types with C++ Implementation</h4> -<p>This example only demonstrates the documentation for types in QML files, but the regular QML commands may be placed inside C++ classes to define the public API of the QML type.</p> -</div> -<!-- @@@componentset --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/testcpp-module.html b/tests/auto/qdoc/generatedoutput/expected_output/noautolist/testcpp-module.html deleted file mode 100644 index 6db15ca22..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/testcpp-module.html +++ /dev/null @@ -1,30 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testcpp.cpp --> - <title>QDoc Test C++ Classes | Test</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">QDoc Test C++ Classes</h1> -<!-- $$$TestCPP-brief --> -<p>A test module page. <a href="#details">More...</a></p> -<!-- @@@TestCPP --> -<!-- $$$TestCPP-description --> -<div class="descr"> -<h2 id="details">Detailed Description</h2> -<div class="admonition note"> -<p><b>Note: </b>This is just a test.</p> -</div> -</div> -<!-- @@@TestCPP --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/obsolete-classes.html b/tests/auto/qdoc/generatedoutput/expected_output/obsolete-classes.html deleted file mode 100644 index 19edb918c..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/obsolete-classes.html +++ /dev/null @@ -1,32 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- classlists.qdoc --> - <title>Obsolete Classes | TestCPP</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#classes-with-obsolete-members">Classes with obsolete members</a></li> -<li class="level2"><a href="#testqdoc">TestQDoc</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Obsolete Classes</h1> -<!-- $$$obsolete-classes.html-description --> -<div class="descr" id="details"> -<h2 id="classes-with-obsolete-members">Classes with obsolete members</h2> -<div class="flowListDiv"> -<dl class="flowList odd"><dt class="alphaChar"><b>T</b></dt> -<dd><a href="..//testqdoc-test-obsolete.html">Test</a> (<a href="testqdoc.html">TestQDoc</a>)</dd> -<dd><a href="..//testqdoc-testderived-obsolete.html">TestDerived</a> (<a href="testqdoc.html">TestQDoc</a>)</dd> -</dl> -</div> -<h3 id="testqdoc">TestQDoc</h3> -</div> -<!-- @@@obsolete-classes.html --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/properties-docbook/testqdoc-testderived.xml b/tests/auto/qdoc/generatedoutput/expected_output/properties-docbook/testqdoc-testderived.xml deleted file mode 100644 index 5dd6c8886..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/properties-docbook/testqdoc-testderived.xml +++ /dev/null @@ -1,255 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>TestDerived Class</db:title> -<db:subtitle>TestQDoc::TestDerived</db:subtitle> -<db:productname>TestCPP</db:productname> -<db:titleabbrev>TestCPP Reference Documentation</db:titleabbrev> -<db:abstract> -<db:para>A derived class in a namespace.</db:para> -</db:abstract> -</db:info> -<db:variablelist> -<db:varlistentry> -<db:term>Header</db:term> -<db:listitem> -<db:para>TestDerived</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term>CMake</db:term> -<db:listitem> -<db:para>find_package(Qt6 COMPONENTS QDocTest REQUIRED)</db:para> -<db:para>target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term>qmake</db:term> -<db:listitem> -<db:para>QT += testcpp</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term>Inherits</db:term> -<db:listitem> -<db:para><db:link xlink:href="testqdoc-test.xml" xlink:role="class">TestQDoc::Test</db:link></db:para> -</db:listitem> -</db:varlistentry> -</db:variablelist> -<db:section xml:id="details"> -<db:title>Detailed Description</db:title> -</db:section> -<db:section xml:id="member-type-documentation"> -<db:title>Member Type Documentation</db:title> -<db:section xml:id="DerivedType-typedef"> -<db:title>[alias] TestDerived::DerivedType</db:title> -<db:typedefsynopsis> -<db:type>DerivedType</db:type><db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:typedefsynopsis> -<db:para>An aliased typedef.</db:para> -</db:section> -<db:section xml:id="NotTypedef-typedef"> -<db:title>[alias] TestDerived::NotTypedef</db:title> -<db:typedefsynopsis> -<db:type>NotTypedef</db:type><db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:typedefsynopsis> -<db:para>I'm an alias, not a typedef.</db:para> -</db:section> -</db:section> -<db:section xml:id="property-documentation"> -<db:title>Property Documentation</db:title> -<db:section xml:id="bindableProp-prop"> -<db:title>[bindable] bindableProp : QString</db:title> -<db:fieldsynopsis> -<db:modifier>(Qt property)</db:modifier> -<db:type>QString</db:type> -<db:varname>bindableProp</db:varname> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="getter">bindableProp</db:synopsisinfo> -<db:synopsisinfo db:role="setter">setBindableProp</db:synopsisinfo> -<db:synopsisinfo db:role="notifier">bindablePropChanged</db:synopsisinfo> -</db:fieldsynopsis> -<db:para>This property supports <db:link xlink:href="https://wiki.qt.io/QProperty">QProperty</db:link> bindings.</db:para> -<db:para>Some property.</db:para> -</db:section> -<db:section xml:id="boolProp-prop"> -<db:title>boolProp : bool</db:title> -<db:fieldsynopsis> -<db:modifier>(Qt property)</db:modifier> -<db:type>bool</db:type> -<db:varname>boolProp</db:varname> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="getter">boolProp</db:synopsisinfo> -<db:synopsisinfo db:role="setter">setBoolProp</db:synopsisinfo> -<db:synopsisinfo db:role="resetter">resetBoolProp</db:synopsisinfo> -<db:synopsisinfo db:role="notifier">boolPropChanged</db:synopsisinfo> -</db:fieldsynopsis> -<db:para>A boolean property.</db:para> -<db:para> -<db:emphasis role="bold">Access functions: -</db:emphasis> -</db:para> -<db:itemizedlist> -<db:listitem> -<db:para><db:type>bool</db:type> <db:emphasis role="bold"><db:link xlink:href="">boolProp</db:link></db:emphasis>()</db:para> -</db:listitem> -<db:listitem> -<db:para><db:type>void</db:type> <db:emphasis role="bold"><db:link xlink:href="">setBoolProp</db:link></db:emphasis>(<db:type>bool</db:type> <db:emphasis>b</db:emphasis>)</db:para> -</db:listitem> -<db:listitem> -<db:para><db:type>void</db:type> <db:emphasis role="bold"><db:link xlink:href="">resetBoolProp</db:link></db:emphasis>()</db:para> -</db:listitem> -</db:itemizedlist> -<db:para> -<db:emphasis role="bold">Notifier signal: -</db:emphasis> -</db:para> -<db:itemizedlist> -<db:listitem> -<db:para><db:type>void</db:type> <db:emphasis role="bold"><db:link xlink:href="">boolPropChanged</db:link></db:emphasis>()</db:para> -</db:listitem> -</db:itemizedlist> -</db:section> -<db:section xml:id="intProp-prop"> -<db:title>[read-only] intProp : int* const</db:title> -<db:fieldsynopsis> -<db:modifier>(Qt property)</db:modifier> -<db:type>int*</db:type> -<db:varname>intProp</db:varname> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="getter">getInt</db:synopsisinfo> -</db:fieldsynopsis> -<db:para>An integer property.</db:para> -<db:para> -<db:emphasis role="bold">Access functions: -</db:emphasis> -</db:para> -<db:itemizedlist> -<db:listitem> -<db:para><db:type>int</db:type> *<db:emphasis role="bold"><db:link xlink:href="">getInt</db:link></db:emphasis>()</db:para> -</db:listitem> -</db:itemizedlist> -</db:section> -<db:section xml:id="name-prop"> -<db:title>[read-only] name : const QString*</db:title> -<db:fieldsynopsis> -<db:modifier>(Qt property)</db:modifier> -<db:type>const QString*</db:type> -<db:varname>name</db:varname> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="getter">name</db:synopsisinfo> -</db:fieldsynopsis> -<db:para>This property holds a name.</db:para> -<db:para> -<db:emphasis role="bold">Access functions: -</db:emphasis> -</db:para> -<db:itemizedlist> -<db:listitem> -<db:para>const <db:type>QString</db:type> *<db:emphasis role="bold"><db:link xlink:href="">name</db:link></db:emphasis>() const</db:para> -</db:listitem> -</db:itemizedlist> -</db:section> -<db:section xml:id="someProp-prop"> -<db:title>[bindable read-only] someProp : QString</db:title> -<db:fieldsynopsis> -<db:modifier>(Qt property)</db:modifier> -<db:type>QString</db:type> -<db:varname>someProp</db:varname> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="getter">someProp</db:synopsisinfo> -</db:fieldsynopsis> -<db:para>This property supports <db:link xlink:href="https://wiki.qt.io/QProperty">QProperty</db:link> bindings.</db:para> -<db:para>Another property.</db:para> -</db:section> -</db:section> -<db:section xml:id="member-function-documentation"> -<db:title>Member Function Documentation</db:title> -<db:section xml:id="emitSomething"> -<db:title>[private signal] TestDerived::void emitSomething()</db:title> -<db:methodsynopsis> -<db:void/> -<db:methodname>emitSomething</db:methodname> -<db:void/> -<db:synopsisinfo db:role="meta">signal</db:synopsisinfo> -<db:synopsisinfo db:role="signature">void emitSomething()</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -<db:para>Emitted when things happen.</db:para> -<db:note> -<db:para>This is a private signal. It can be used in signal connections but cannot be emitted by the user.</db:para></db:note> -</db:section> -<db:section xml:id="invokeMe"> -<db:title>[invokable] TestDerived::void invokeMe() const</db:title> -<db:methodsynopsis> -<db:modifier>const</db:modifier> -<db:void/> -<db:methodname>invokeMe</db:methodname> -<db:void/> -<db:synopsisinfo db:role="meta">plain</db:synopsisinfo> -<db:synopsisinfo db:role="signature">void invokeMe() const</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -<db:para>Something invokable.</db:para> -<db:note> -<db:para>This function can be invoked via the meta-object system and from QML. See <db:link xlink:href="">Q_INVOKABLE</db:link>.</db:para> -</db:note> -</db:section> -<db:section xml:id="virtualFun"> -<db:title>[override virtual] TestDerived::void virtualFun()</db:title> -<db:methodsynopsis> -<db:modifier>virtual</db:modifier> -<db:void/> -<db:methodname>virtualFun</db:methodname> -<db:modifier>override</db:modifier> -<db:void/> -<db:synopsisinfo db:role="meta">plain</db:synopsisinfo> -<db:synopsisinfo db:role="signature">void virtualFun() override</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -<db:para>Reimplements: <db:link xlink:href="testqdoc-test.xml#virtualFun" type="function">Test::virtualFun()</db:link>.</db:para> -</db:section> -<db:section xml:id="obsolete"> -<db:title>Obsolete Members for TestDerived</db:title> -<db:para><db:emphasis role="bold">The following members of class <db:link xlink:href="testqdoc-testderived.xml">TestDerived</db:link> are deprecated.</db:emphasis> We strongly advise against using them in new code.</db:para> -<db:section xml:id="member-function-documentation"> -<db:title>Member Function Documentation</db:title> -<db:section xml:id="staticObsoleteMember"> -<db:title>[static] TestDerived::void staticObsoleteMember()</db:title> -<db:methodsynopsis> -<db:modifier>static</db:modifier> -<db:void/> -<db:methodname>staticObsoleteMember</db:methodname> -<db:void/> -<db:synopsisinfo db:role="meta">plain</db:synopsisinfo> -<db:synopsisinfo db:role="signature">void staticObsoleteMember()</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">deprecated</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -<db:para>This function is deprecated. We strongly advise against using it in new code.</db:para> -<db:para>Static obsolete method.</db:para> -</db:section> -</db:section> -</db:section> -</db:section></db:article> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/properties/testcpp.index b/tests/auto/qdoc/generatedoutput/expected_output/properties/testcpp.index deleted file mode 100644 index 62da1db3a..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/properties/testcpp.index +++ /dev/null @@ -1,107 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE QDOCINDEX> -<INDEX url="" title="TestCPP Reference Documentation" version="" project="TestCPP"> - <namespace name="" status="active" access="public" module="testcpp"> - <function name="QDOCTEST_MACRO" href="testqdoc.html#QDOCTEST_MACRO" status="active" access="public" documented="true" related="0" meta="macrowithoutparams" virtual="non" const="false" static="false" final="false" override="false" type="" signature="QDOCTEST_MACRO"/> - <function name="QDOCTEST_MACRO2" href="testqdoc-test.html#QDOCTEST_MACRO2" status="active" access="public" documented="true" related="1" since="Test 1.1" meta="macrowithparams" virtual="non" const="false" static="false" final="false" override="false" type="" brief="A macro with argument x" signature="QDOCTEST_MACRO2(int &x)" groups="testgroup"> - <parameter type="int &" name="x" default=""/> - </function> - <page name="autolinking.html" href="autolinking.html" status="active" location="classlists.qdoc" documented="true" subtype="page" title="Autolinking" fulltitle="Autolinking" subtitle=""> - <contents name="testqdoc" title="TestQDoc" level="1"/> - </page> - <namespace name="CrossModuleRef" href="crossmoduleref.html" status="active" access="public" location="testcpp.h" documented="true" module="TestCPP" brief="Namespace that has documented functions in multiple modules"> - <function name="documentMe" fullname="CrossModuleRef::documentMe" href="crossmoduleref.html#documentMe" status="active" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" signature="void documentMe()"/> - </namespace> - <class name="DontLinkToMe" href="dontlinktome.html" status="ignored" access="public" location="testcpp.h" documented="true" module="TestCPP" brief="Class that does not generate documentation"/> - <page name="obsolete-classes.html" href="obsolete-classes.html" status="active" location="classlists.qdoc" documented="true" subtype="page" title="Obsolete Classes" fulltitle="Obsolete Classes" subtitle=""> - <contents name="classes-with-obsolete-members" title="Classes with obsolete members" level="1"/> - <contents name="testqdoc" title="TestQDoc" level="2"/> - </page> - <page name="https://wiki.qt.io/QProperty" href="https://wiki.qt.io/QProperty" status="active" location="properties.qdoc" documented="true" subtype="externalpage" title="QProperty" fulltitle="QProperty" subtitle=""/> - <namespace name="TestQDoc" href="testqdoc.html" status="active" access="public" location="testcpp.h" documented="true" module="TestCPP" brief="A namespace"> - <contents name="usage" title="Usage" level="1"/> - <function name="QDOCTEST_MACRO" href="testqdoc.html#QDOCTEST_MACRO" status="active" access="public" documented="true" related="0" meta="macrowithoutparams" virtual="non" const="false" static="false" final="false" override="false" type="" signature="QDOCTEST_MACRO"/> - <class name="Test" fullname="TestQDoc::Test" href="testqdoc-test.html" status="active" access="public" location="testcpp.h" documented="true" groups="testgroup" module="TestCPP" brief="A class in a namespace"> - <function name="QDOCTEST_MACRO2" href="testqdoc-test.html#QDOCTEST_MACRO2" status="active" access="public" documented="true" related="1" since="Test 1.1" meta="macrowithparams" virtual="non" const="false" static="false" final="false" override="false" type="" brief="A macro with argument x" signature="QDOCTEST_MACRO2(int &x)" groups="testgroup"> - <parameter type="int &" name="x" default=""/> - </function> - <function name="Test" fullname="TestQDoc::Test::Test" href="testqdoc-test.html#Test" status="active" access="public" documented="true" meta="constructor" virtual="non" const="false" static="false" final="false" override="false" type="" signature="Test()"/> - <function name="anotherObsoleteMember" fullname="TestQDoc::Test::anotherObsoleteMember" href="testqdoc-test-obsolete.html#anotherObsoleteMember" status="deprecated" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" signature="void anotherObsoleteMember()"/> - <function name="deprecatedMember" fullname="TestQDoc::Test::deprecatedMember" href="testqdoc-test-obsolete.html#deprecatedMember" status="deprecated" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" signature="void deprecatedMember()"/> - <function name="funcPtr" fullname="TestQDoc::Test::funcPtr" href="testqdoc-test.html#funcPtr" status="active" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void (*)(bool)" signature="void (*)(bool) funcPtr(bool b, const char *s)"> - <parameter type="bool" name="b" default=""/> - <parameter type="const char *" name="s" default=""/> - </function> - <function name="inlineFunction" fullname="TestQDoc::Test::inlineFunction" href="testqdoc-test.html#inlineFunction" status="active" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" brief="An inline function, documented using the \fn QDoc command" signature="void inlineFunction()"/> - <function name="obsoleteMember" fullname="TestQDoc::Test::obsoleteMember" href="testqdoc-test-obsolete.html#obsoleteMember" status="deprecated" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" signature="void obsoleteMember()"/> - <function name="operator++" fullname="TestQDoc::Test::operator++" href="testqdoc-test-obsolete.html#operator-2b-2b" status="deprecated" access="public" location="testcpp.h" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="TestQDoc::Test &" signature="TestQDoc::Test & operator++()"/> - <function name="operator--" fullname="TestQDoc::Test::operator--" href="testqdoc-test-obsolete.html#operator--" status="deprecated" access="public" location="testcpp.h" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="TestQDoc::Test &" signature="TestQDoc::Test & operator--()"/> - <function name="operator=" fullname="TestQDoc::Test::operator=" href="testqdoc-test.html#operator-eq" status="active" access="public" documented="true" meta="move-assign" virtual="non" const="false" static="false" final="false" override="false" type="TestQDoc::Test &" signature="TestQDoc::Test & operator=(TestQDoc::Test &&other)"> - <parameter type="TestQDoc::Test &&" name="other" default=""/> - </function> - <function name="operator==" href="testqdoc-test.html#operator-eq-eq" status="active" access="public" location="testcpp.h" documented="true" related="2" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="bool" signature="bool operator==(const TestQDoc::Test &lhs, const TestQDoc::Test &rhs)"> - <parameter type="const TestQDoc::Test &" name="lhs" default=""/> - <parameter type="const TestQDoc::Test &" name="rhs" default=""/> - </function> - <function name="overload" fullname="TestQDoc::Test::overload" href="testqdoc-test.html#overload" status="active" access="protected" location="testcpp.h" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" signature="void overload()"/> - <function name="overload" fullname="TestQDoc::Test::overload" href="testqdoc-test.html#overload-1" status="active" access="protected" location="testcpp.h" documented="true" since="Test 1.2" meta="plain" virtual="non" const="false" static="false" final="false" override="false" overload="true" overload-number="1" type="void" signature="void overload(bool b)"> - <parameter type="bool" name="b" default=""/> - </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, int v)"> - <parameter type="int" name="" default=""/> - <parameter type="int" name="v" default="0"/> - </function> - <function name="someFunctionDefaultArg" fullname="TestQDoc::Test::someFunctionDefaultArg" href="testqdoc-test.html#someFunctionDefaultArg" status="active" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" signature="void someFunctionDefaultArg(int i, bool b)" groups="testgroup"> - <parameter type="int" name="i" default=""/> - <parameter type="bool" name="b" default="false"/> - </function> - <function name="virtualFun" fullname="TestQDoc::Test::virtualFun" href="testqdoc-test.html#virtualFun" status="active" access="public" location="testcpp.h" documented="true" meta="plain" virtual="virtual" const="false" static="false" final="false" override="false" type="void" signature="void virtualFun()"/> - <typedef name="SomeType" fullname="TestQDoc::Test::SomeType" href="testqdoc-test.html#SomeType-typedef" status="active" access="public" location="testcpp.h" documented="true"/> - </class> - <class name="TestDerived" fullname="TestQDoc::TestDerived" href="testqdoc-testderived.html" status="active" access="public" location="testcpp.h" documented="true" bases="TestQDoc::Test" module="TestCPP" brief="A derived class in a namespace"> - <function name="bindableProp" fullname="TestQDoc::TestDerived::bindableProp" href="testqdoc-testderived.html#bindableProp-prop" status="active" access="public" location="testcpp.h" meta="plain" virtual="non" const="false" static="false" final="false" override="false" associated-property="bindableProp" type="QBindable<QString>" signature="QBindable<QString> bindableProp()"/> - <function name="bindablePropChanged" fullname="TestQDoc::TestDerived::bindablePropChanged" href="testqdoc-testderived.html#bindableProp-prop" status="active" access="public" location="testcpp.h" meta="signal" virtual="non" const="false" static="false" final="false" override="false" associated-property="bindableProp" type="void" signature="void bindablePropChanged()"/> - <function name="boolProp" fullname="TestQDoc::TestDerived::boolProp" href="testqdoc-testderived.html#boolProp-prop" status="active" access="public" location="testcpp.h" meta="plain" virtual="non" const="false" static="false" final="false" override="false" associated-property="boolProp" type="bool" signature="bool boolProp()"/> - <function name="boolPropChanged" fullname="TestQDoc::TestDerived::boolPropChanged" href="testqdoc-testderived.html#boolProp-prop" status="active" access="public" location="testcpp.h" meta="signal" virtual="non" const="false" static="false" final="false" override="false" associated-property="boolProp" type="void" signature="void boolPropChanged()"/> - <function name="emitSomething" fullname="TestQDoc::TestDerived::emitSomething" href="testqdoc-testderived.html#emitSomething" status="active" access="public" location="testcpp.h" documented="true" meta="signal" virtual="non" const="false" static="false" final="false" override="false" type="void" signature="void emitSomething()"/> - <function name="getInt" fullname="TestQDoc::TestDerived::getInt" href="testqdoc-testderived.html#intProp-prop" status="active" access="public" location="testcpp.h" meta="plain" virtual="non" const="false" static="false" final="false" override="false" associated-property="intProp" type="int *" signature="int * getInt()"/> - <function name="invokeMe" fullname="TestQDoc::TestDerived::invokeMe" href="testqdoc-testderived.html#invokeMe" status="active" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="true" static="false" final="false" override="false" type="void" brief="Something invokable" signature="void invokeMe() const"/> - <function name="name" fullname="TestQDoc::TestDerived::name" href="testqdoc-testderived.html#name-prop" status="active" access="public" location="testcpp.h" meta="plain" virtual="non" const="true" static="false" final="false" override="false" associated-property="name" type="const QString *" signature="const QString * name() const"/> - <function name="resetBoolProp" fullname="TestQDoc::TestDerived::resetBoolProp" href="testqdoc-testderived.html#boolProp-prop" status="active" access="public" location="testcpp.h" meta="slot" virtual="non" const="false" static="false" final="false" override="false" associated-property="boolProp" type="void" signature="void resetBoolProp()"/> - <function name="setBindableProp" fullname="TestQDoc::TestDerived::setBindableProp" href="testqdoc-testderived.html#bindableProp-prop" status="active" access="public" location="testcpp.h" meta="slot" virtual="non" const="false" static="false" final="false" override="false" associated-property="bindableProp" type="void" signature="void setBindableProp(const QString &s)"> - <parameter type="const QString &" name="s" default=""/> - </function> - <function name="setBoolProp" fullname="TestQDoc::TestDerived::setBoolProp" href="testqdoc-testderived.html#boolProp-prop" status="active" access="public" location="testcpp.h" meta="slot" virtual="non" const="false" static="false" final="false" override="false" associated-property="boolProp" type="void" signature="void setBoolProp(bool b)"> - <parameter type="bool" name="b" default=""/> - </function> - <function name="someProp" fullname="TestQDoc::TestDerived::someProp" href="testqdoc-testderived.html#someProp-prop" status="active" access="public" location="testcpp.h" meta="plain" virtual="non" const="false" static="false" final="false" override="false" associated-property="someProp" type="const QString &" signature="const QString & someProp()"/> - <function name="staticObsoleteMember" fullname="TestQDoc::TestDerived::staticObsoleteMember" href="testqdoc-testderived-obsolete.html#staticObsoleteMember" status="deprecated" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="true" final="false" override="false" type="void" signature="void staticObsoleteMember()"/> - <function name="virtualFun" fullname="TestQDoc::TestDerived::virtualFun" href="testqdoc-testderived.html#virtualFun" status="active" access="public" location="testcpp.h" documented="true" meta="plain" virtual="virtual" const="false" static="false" final="false" override="true" type="void" signature="void virtualFun() override"/> - <typedef name="DerivedType" fullname="TestQDoc::TestDerived::DerivedType" href="testqdoc-testderived.html#DerivedType-typedef" status="active" access="public" location="testcpp.h" documented="true" aliasedtype="Test::SomeType"/> - <typedef name="NotTypedef" fullname="TestQDoc::TestDerived::NotTypedef" href="testqdoc-testderived.html#NotTypedef-typedef" status="active" access="public" location="testcpp.h" documented="true" aliasedtype="int"/> - <property name="bindableProp" fullname="TestQDoc::TestDerived::bindableProp" href="testqdoc-testderived.html#bindableProp-prop" status="active" access="public" location="testcpp.h" documented="true" bindable="true"> - <getter name="bindableProp"/> - <setter name="setBindableProp"/> - <notifier name="bindablePropChanged"/> - </property> - <property name="boolProp" fullname="TestQDoc::TestDerived::boolProp" href="testqdoc-testderived.html#boolProp-prop" status="active" access="public" location="testcpp.h" documented="true"> - <getter name="boolProp"/> - <setter name="setBoolProp"/> - <resetter name="resetBoolProp"/> - <notifier name="boolPropChanged"/> - </property> - <property name="intProp" fullname="TestQDoc::TestDerived::intProp" href="testqdoc-testderived.html#intProp-prop" status="active" access="public" location="testcpp.h" documented="true"> - <getter name="getInt"/> - </property> - <property name="name" fullname="TestQDoc::TestDerived::name" href="testqdoc-testderived.html#name-prop" status="active" access="public" location="testcpp.h" documented="true" brief="This property holds a name"> - <getter name="name"/> - </property> - <property name="someProp" fullname="TestQDoc::TestDerived::someProp" href="testqdoc-testderived.html#someProp-prop" status="active" access="public" location="testcpp.h" documented="true" bindable="true"> - <getter name="someProp"/> - </property> - </class> - </namespace> - <group name="testgroup" href="testgroup.html" status="internal" seen="false" title=""/> - <module name="TestCPP" href="testcpp-module.html" status="active" documented="true" seen="true" title="QDoc Test C++ Classes" brief="A test module page"/> - </namespace> -</INDEX> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived-members.html b/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived-members.html deleted file mode 100644 index 44ac132be..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived-members.html +++ /dev/null @@ -1,43 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testcpp.cpp --> - <title>List of All Members for TestDerived | TestCPP</title> -</head> -<body> -<li>TestDerived</li> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">List of All Members for TestDerived</h1> -<p>This is the complete list of members for <a href="testqdoc-testderived.html">TestQDoc::TestDerived</a>, including inherited members.</p> -<div class="table"><table class="propsummary"> -<tr><td class="topAlign"><ul> -<li class="fn"><span class="name"><b><a href="testqdoc-testderived.html#DerivedType-typedef">DerivedType</a></b></span></li> -<li class="fn"><span class="name"><b><a href="testqdoc-testderived.html#NotTypedef-typedef">NotTypedef</a></b></span></li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#SomeType-typedef">SomeType</a></b></span></li> -<li class="fn"><span class="name"><b><a href="testqdoc-testderived.html#bindableProp-prop">bindablePropChanged</a></b></span>()</li> -<li class="fn"><span class="name"><b><a href="testqdoc-testderived.html#boolProp-prop">boolPropChanged</a></b></span>()</li> -<li class="fn"><span class="name"><b><a href="testqdoc-testderived.html#emitSomething">emitSomething</a></b></span>()</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#operator-eq">operator=</a></b></span>(TestQDoc::Test &&) : TestQDoc::Test &</li> -<li class="fn"><span class="name"><b><a href="testqdoc-testderived.html#boolProp-prop">resetBoolProp</a></b></span>()</li> -<li class="fn"><span class="name"><b><a href="testqdoc-testderived.html#bindableProp-prop">setBindableProp</a></b></span>(const QString &)</li> -<li class="fn"><span class="name"><b><a href="testqdoc-testderived.html#boolProp-prop">setBoolProp</a></b></span>(bool)</li> -<li class="fn"><span class="name"><b><a href="testqdoc-testderived.html#bindableProp-prop">bindableProp</a></b></span>() : QBindable<QString></li> -<li class="fn"><span class="name"><b><a href="testqdoc-testderived.html#boolProp-prop">boolProp</a></b></span>() : bool</li> -</ul></td><td class="topAlign"><ul> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#funcPtr">funcPtr</a></b></span>(bool, const char *) : void (*)(bool)</li> -<li class="fn"><span class="name"><b><a href="testqdoc-testderived.html#intProp-prop">getInt</a></b></span>() : int *</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#inlineFunction">inlineFunction</a></b></span>()</li> -<li class="fn"><span class="name"><b><a href="testqdoc-testderived.html#invokeMe">invokeMe</a></b></span>() const</li> -<li class="fn"><span class="name"><b><a href="testqdoc-testderived.html#name-prop">name</a></b></span>() const : const QString *</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#overload">overload</a></b></span>()</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#overload-1">overload</a></b></span>(bool)</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#someFunction">someFunction</a></b></span>(int, int) : int</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#someFunctionDefaultArg">someFunctionDefaultArg</a></b></span>(int, bool)</li> -<li class="fn"><span class="name"><b><a href="testqdoc-testderived.html#someProp-prop">someProp</a></b></span>() : const QString &</li> -<li class="fn"><span class="name"><b><a href="testqdoc-testderived.html#virtualFun">virtualFun</a></b></span>()</li> -</ul> -</td></tr> -</table></div> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived.html b/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived.html deleted file mode 100644 index f6fd4a662..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived.html +++ /dev/null @@ -1,156 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testcpp.cpp --> - <title>TestDerived Class | TestCPP</title> -</head> -<body> -<li>TestDerived</li> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#public-types">Public Types</a></li> -<li class="level1"><a href="#properties">Properties</a></li> -<li class="level1"><a href="#public-functions">Public Functions</a></li> -<li class="level1"><a href="#reimplemented-public-functions">Reimplemented Public Functions</a></li> -<li class="level1"><a href="#public-slots">Public Slots</a></li> -<li class="level1"><a href="#signals">Signals</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">TestDerived Class</h1> -<span class="small-subtitle">class <a href="testqdoc.html">TestQDoc</a>::TestDerived</span> -<!-- $$$TestDerived-brief --> -<p>A derived class in a namespace. <a href="#details">More...</a></p> -<!-- @@@TestDerived --> -<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> -<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> -<h2 id="public-types">Public Types</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#DerivedType-typedef">DerivedType</a></b></td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#NotTypedef-typedef">NotTypedef</a></b></td></tr> -</table></div> -<h2 id="properties">Properties</h2> -<div class="table"><table class="propsummary"> -<tr><td class="topAlign"><ul> -<li class="fn"><b><a href="testqdoc-testderived.html#bindableProp-prop">bindableProp</a></b> : QString</li> -<li class="fn"><b><a href="testqdoc-testderived.html#boolProp-prop">boolProp</a></b> : bool</li> -<li class="fn"><b><a href="testqdoc-testderived.html#intProp-prop">intProp</a></b> : int* const</li> -</ul></td><td class="topAlign"><ul> -<li class="fn"><b><a href="testqdoc-testderived.html#name-prop">name</a></b> : const QString*</li> -<li class="fn"><b><a href="testqdoc-testderived.html#someProp-prop">someProp</a></b> : QString</li> -</ul> -</td></tr> -</table></div> -<h2 id="public-functions">Public Functions</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> QBindable<QString> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#bindableProp-prop">bindableProp</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> bool </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#boolProp-prop">boolProp</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> int *</td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#intProp-prop">getInt</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#invokeMe">invokeMe</a></b>() const</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> const QString *</td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#name-prop">name</a></b>() const</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> const QString &</td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#someProp-prop">someProp</a></b>()</td></tr> -</table></div> -<h2 id="reimplemented-public-functions">Reimplemented Public Functions</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> virtual void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#virtualFun">virtualFun</a></b>() override</td></tr> -</table></div> -<h2 id="public-slots">Public Slots</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#boolProp-prop">resetBoolProp</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#bindableProp-prop">setBindableProp</a></b>(const QString &<i>s</i>)</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#boolProp-prop">setBoolProp</a></b>(bool <i>b</i>)</td></tr> -</table></div> -<h2 id="signals">Signals</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#bindableProp-prop">bindablePropChanged</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#boolProp-prop">boolPropChanged</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#emitSomething">emitSomething</a></b>()</td></tr> -</table></div> -<!-- $$$TestDerived-description --> -<div class="descr"> -<h2 id="details">Detailed Description</h2> -</div> -<!-- @@@TestDerived --> -<div class="types"> -<h2>Member Type Documentation</h2> -<!-- $$$DerivedType --> -<h3 class="fn" id="DerivedType-typedef"><code>[alias] </code>TestDerived::<span class="name">DerivedType</span></h3> -<p>An aliased typedef.</p> -<!-- @@@DerivedType --> -<!-- $$$NotTypedef --> -<h3 class="fn" id="NotTypedef-typedef"><code>[alias] </code>TestDerived::<span class="name">NotTypedef</span></h3> -<p>I'm an alias, not a typedef.</p> -<!-- @@@NotTypedef --> -</div> -<div class="prop"> -<h2>Property Documentation</h2> -<!-- $$$bindableProp-prop$$$bindableProp$$$setBindablePropconstQString&$$$bindablePropChanged --> -<h3 class="fn" id="bindableProp-prop"><code>[bindable] </code><span class="name">bindableProp</span> : <span class="type">QString</span></h3> -<p><b>Note: </b>This property supports <a href="https://wiki.qt.io/QProperty">QProperty</a> bindings.</p> -<p>Some property.</p> -<!-- @@@bindableProp --> -<!-- $$$boolProp-prop$$$boolProp$$$setBoolPropbool$$$resetBoolProp$$$boolPropChanged --> -<h3 class="fn" id="boolProp-prop"><span class="name">boolProp</span> : <span class="type">bool</span></h3> -<p>A boolean property.</p> -<p><b>Access functions:</b></p> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft topAlign rightAlign"> bool </td><td class="memItemRight bottomAlign"><span class="name"><b>boolProp</b></span>()</td></tr> -<tr><td class="memItemLeft topAlign rightAlign"> void </td><td class="memItemRight bottomAlign"><span class="name"><b>setBoolProp</b></span>(bool <i>b</i>)</td></tr> -<tr><td class="memItemLeft topAlign rightAlign"> void </td><td class="memItemRight bottomAlign"><span class="name"><b>resetBoolProp</b></span>()</td></tr> -</table></div> -<p><b>Notifier signal:</b></p> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft topAlign rightAlign"> void </td><td class="memItemRight bottomAlign"><span class="name"><b>boolPropChanged</b></span>()</td></tr> -</table></div> -<!-- @@@boolProp --> -<!-- $$$intProp-prop$$$getInt --> -<h3 class="fn" id="intProp-prop"><code>[read-only] </code><span class="name">intProp</span> : <span class="type">int</span>* const</h3> -<p>An integer property.</p> -<p><b>Access functions:</b></p> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft topAlign rightAlign"> int *</td><td class="memItemRight bottomAlign"><span class="name"><b>getInt</b></span>()</td></tr> -</table></div> -<!-- @@@intProp --> -<!-- $$$name-prop$$$name --> -<h3 class="fn" id="name-prop"><code>[read-only] </code><span class="name">name</span> : const <span class="type">QString</span>*</h3> -<p>This property holds a name.</p> -<p><b>Access functions:</b></p> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft topAlign rightAlign"> const QString *</td><td class="memItemRight bottomAlign"><span class="name"><b>name</b></span>() const</td></tr> -</table></div> -<!-- @@@name --> -<!-- $$$someProp-prop$$$someProp --> -<h3 class="fn" id="someProp-prop"><code>[bindable read-only] </code><span class="name">someProp</span> : <span class="type">QString</span></h3> -<p><b>Note: </b>This property supports <a href="https://wiki.qt.io/QProperty">QProperty</a> bindings.</p> -<p>Another property.</p> -<!-- @@@someProp --> -</div> -<div class="func"> -<h2>Member Function Documentation</h2> -<!-- $$$emitSomething[overload1]$$$emitSomething --> -<h3 class="fn" id="emitSomething"><code>[private signal] </code><span class="type">void</span> TestDerived::<span class="name">emitSomething</span>()</h3> -<p>Emitted when things happen.</p> -<p><b>Note: </b>This is a private signal. It can be used in signal connections but cannot be emitted by the user.</p> -<!-- @@@emitSomething --> -<!-- $$$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.</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> -<p>Reimplements: <a href="testqdoc-test.html#virtualFun">Test::virtualFun</a>().</p> -<!-- @@@virtualFun --> -</div> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html b/tests/auto/qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html deleted file mode 100644 index 93f512497..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html +++ /dev/null @@ -1,26 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- type.cpp --> - <title>QDoc.Test QML Module | Test</title> -</head> -<body> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">QDoc.Test QML Module</h1> -<p><b>This module is under development and is subject to change.</b></p> -<p>This module was introduced in Qt 1.1.</p> -<!-- $$$QDoc.Test-description --> -<div class="descr" id="details"> -</div> -<!-- @@@QDoc.Test --> -<div class="table"><table class="annotated"> -<tr class="odd topAlign"><td class="tblName"><p><a href="qml-qdoc-test-abstractparent.html">AbstractParent</a></p></td><td class="tblDescr"><p>Abstract base QML type</p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="qml-qdoc-test-child.html">Child</a></p></td><td class="tblDescr"><p>A Child inheriting its parent</p></td></tr> -<tr class="odd topAlign"><td class="tblName"><p><a href="qml-qdoc-test-doctest.html">DocTest</a></p></td><td class="tblDescr"><p>Represents a doc test case</p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="qml-qdoc-test-type.html">Type</a></p></td><td class="tblDescr"><p>A QML type documented in a .cpp file</p></td></tr> -<tr class="odd topAlign"><td class="tblName"><p><a href="qml-qdoc-test-yetanotherchild.html">YetAnotherChild</a></p></td><td class="tblDescr"><p>A type inheriting from internal abstract parent</p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="qml-int.html">int</a></p></td><td class="tblDescr"><p>An integer basic type</p></td></tr> -</table></div> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-exhaustive.html b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-exhaustive.html deleted file mode 100644 index cbf7d6894..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-exhaustive.html +++ /dev/null @@ -1,62 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- qdoctests-outputfromqdocfiles.qdoc --> - <title>Exhaustive testing of QDoc commands | OutputFromQDocFiles</title> -</head> -<body> -<li id="buildversion">OutputFromQDocFiles - A test project for QDoc build artifacts</li> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#this-is-a-section1">This is a section1</a></li> -<li class="level2"><a href="#this-is-a-section2">This is a section2</a></li> -<li class="level3"><a href="#this-is-a-section3">This is a section3</a></li> -<li class="level4"><a href="#this-is-a-section4">This is a section4</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Exhaustive testing of QDoc commands</h1> -<!-- $$$qdoctests-qdocfileoutput-exhaustive.html-description --> -<div class="descr" id="details"> -<h2 id="this-is-a-section1">This is a section1</h2> -<h3 id="this-is-a-section2">This is a section2</h3> -<h4 id="this-is-a-section3">This is a section3</h4> -<h5 id="this-is-a-section4">This is a section4</h5> -<pre class="cpp plain">This is bad code</pre> -<p>This text should have a line break riiiiight <br /> - noooow.</p> -<p><b>All your text belong to bold</b> ...And this is an examble of only <b>bold</b> being, well, bold.</p> -<pre class="cpp"> ...</pre> -<pre class="js"><span class="comment">// If I knew JavaScript, this is where I would write it.</span></pre> -<p>And if I knew qmltext, I guess this is where that would go. </p> -<p class="figCaption">This a caption</p> -<div class="LegaleseLeft"><p>Lorem legal ipsum</p> -</div><blockquote><p>This is a quotation.</p> -</blockquote> - <html><body>This is <b>raw</b>. Like the <h1>Eddie Murphy</h1> movie. Just not as funny.</body></html> - <p>Look, ma! I made a sidebar!</p> -<div class="table"><table class="generic"> - <tr valign="top" class="odd"><td >Table item in a table row</td></tr> -<tr valign="top" class="even"><td >Another item in a different row</td></tr> -</table></div> -<div class="admonition important"> -<p><b>Important: </b>This is really important.</p> -</div> -<p>For example, if you have code like</p> -<pre class="cpp plain">This is old code.</pre> -<p>you can rewrite it as</p> -<pre class="cpp">This is <span class="keyword">new</span> and shiny<span class="operator">!</span></pre> -<div class="admonition note"> -<p><b>Note: </b>The code above doesn't compile</p> -</div> -<hr /> -<div class="admonition warning"> -<p><b>Warning: </b>The following commands have yet to be tested: footnote link sincelist header index topicref // or just don’t care, remove it image inlineimage printline printto printuntil // what’s the difference between printto and printuntil??? quotefile quotefromfile quotefunction skipline skipto skipuntil span snippet codeline overload sub sup tableofcontents tt uicontrol endmapref endomit underline unicode</p> -</div> -</div> -<!-- @@@qdoctests-qdocfileoutput-exhaustive.html --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html deleted file mode 100644 index 3dca3f698..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html +++ /dev/null @@ -1,36 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- qdoctests-outputfromqdocfiles.qdoc --> - <title>Testing QDoc's link command | OutputFromQDocFiles</title> -</head> -<body> -<li id="buildversion">OutputFromQDocFiles - A test project for QDoc build artifacts</li> - <link rel="prev" href="qdoctests-qdocfileoutput.html" /> - <link rel="next" href="toc.html" /> -<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> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#link-targets">Link targets</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Testing QDoc's link command</h1> -<!-- $$$qdoctests-qdocfileoutput-linking.html-description --> -<div class="descr" id="details"> -<span id="link-test-target"></span><h2 id="link-targets">Link targets</h2> -<p>Valid parameters for the link command (<code>\l</code>) are page and section titles, targets defined with \target or \keyword commands, and API reference keywords (types, methods, namespaces, and so on).</p> -</div> -<!-- @@@qdoctests-qdocfileoutput-linking.html --> -<p class="naviNextPrevious footerNavi"> -<a class="prevPage" href="qdoctests-qdocfileoutput.html">QDoc Testing</a> -<a class="nextPage" href="toc.html">Table of Contents</a> -</p> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html deleted file mode 100644 index 325fbdec9..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html +++ /dev/null @@ -1,57 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- qdoctests-outputfromqdocfiles.qdoc --> - <title>Testing QDoc output from .qdoc files | OutputFromQDocFiles</title> -</head> -<body> -<li id="buildversion">OutputFromQDocFiles - A test project for QDoc build artifacts</li> - <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> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#supported-file-types">Supported file types</a></li> -<li class="level1"><a href="#further-information">Further information</a></li> -<li class="level1"><a href="#linking">Linking</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Testing QDoc output from .qdoc files</h1> -<!-- $$$qdoctests-qdocfileoutput.html-description --> -<div class="descr" id="details"> -<p>QDoc generates documentation for software projects. It does this by extracting <i>QDoc comments</i> from project source files. QDoc comments are signified by a C-style-like comment tag followed by an exclamation point, like this: <code>/*!</code> <code>This text is contained within QDoc comment tags.</code> <code>*/</code>.</p> -<h2 id="supported-file-types">Supported file types</h2> -<p>QDoc parses <code>.cpp</code> and <code>.qdoc</code> files. It does extract comments from header (<code>.h</code>) files.</p> -<h2 id="further-information">Further information</h2> -<p>This test document is written with the purpose of testing the output QDoc generates when parsing <code>.qdoc</code> files. It is fairly simple and makes use of a limited subset of QDoc's command. Those commands are:</p> -<ul> -<li><code>\page</code></li> -<li><code>\title</code></li> -<li><code>\brief</code></li> -<li><code>\e</code> (for emphasizing "QDoc comments")</li> -<li><code>\c</code> (for multiple monospace-formatted entries)</li> -<li><code>\section1</code></li> -<li><code>\list</code></li> -<li><code>\li</code></li> -<li><code>\endlist</code></li> -</ul> -<h2 id="linking">Linking</h2> -<p>There are multiple ways to create hyperlinks to other topics:</p> -<ul> -<li><a href="qdoctests-qdocfileoutput-linking.html">Linking to a page title</a></li> -<li><a href="qdoctests-qdocfileoutput-linking.html#link-targets">Linking to a section title</a></li> -<li><a href="qdoctests-qdocfileoutput-linking.html#link-test-target">Linking using a \target string</a></li> -<li><a href="qdoctests-qdocfileoutput-linking.html">Linking using a \keyword string</a></li> -</ul> -</div> -<!-- @@@qdoctests-qdocfileoutput.html --> -<p class="naviNextPrevious footerNavi"> -<a class="nextPage" href="qdoctests-qdocfileoutput-linking.html">QDoc Linking Test</a> -</p> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html deleted file mode 100644 index 77c951c05..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html +++ /dev/null @@ -1,39 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- parent.qdoc --> - <title>int QML Basic Type | Test</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#methods">Methods</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">int QML Basic Type</h1> -<h2 id="methods">Methods</h2> -<ul> -<li class="fn">int <b><a href="qml-int.html#abs-method">abs</a></b>()</li> -</ul> -<!-- $$$int-description --> -<div class="descr" id="details"> -</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> -<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/expected_output/qml-linkmodule-grandchild-members.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-linkmodule-grandchild-members.html deleted file mode 100644 index 8052be015..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-linkmodule-grandchild-members.html +++ /dev/null @@ -1,24 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- linking.qdoc --> - <title>List of All Members for GrandChild | IndexLinking</title> -</head> -<body> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">List of All Members for GrandChild</h1> -<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><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><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 deleted file mode 100644 index 32165b273..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-abstractparent.html +++ /dev/null @@ -1,95 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- parent.qdoc --> - <title>AbstractParent QML Type | Test</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#properties">Properties</a></li> -<li class="level1"><a href="#methods">Methods</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">AbstractParent QML Type</h1> -<!-- $$$AbstractParent-brief --> -<p>Abstract base QML type. <a href="#details">More...</a></p> -<!-- @@@AbstractParent --> -<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"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="qml-qdoc-test-child.html">Child</a></p> -</td></tr></table></div><ul> -<li><a href="qml-qdoc-test-abstractparent-members.html">List of all members, including inherited members</a></li> -</ul> -<h2 id="properties">Properties</h2> -<ul> -<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><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> -<!-- @@@AbstractParent --> -<h2>Property Documentation</h2> -<!-- $$$children --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -</div></div><!-- @@@children --> -<br/> -<!-- $$$name --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -</div></div><!-- @@@name --> -<br/> -<h2>Method Documentation</h2> -<!-- $$$name$$$name --> -<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> -<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> -</div></div><!-- @@@name --> -<br/> -<!-- $$$name[overload1]$$$nameChild --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -</div></div><!-- @@@name --> -<br/> -<!-- $$$rear[overload1]$$$rearChildvar --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -</div></div><!-- @@@rear --> -<br/> -</body> -</html> 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 deleted file mode 100644 index 5cf37e732..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-child.html +++ /dev/null @@ -1,95 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- parent.qdoc --> - <title>Child QML Type | Test</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#properties">Properties</a></li> -<li class="level1"><a href="#methods">Methods</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Child QML Type</h1> -<!-- $$$Child-brief --> -<p>A Child inheriting its parent. <a href="#details">More...</a></p> -<!-- @@@Child --> -<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"> Inherits:</td><td class="memItemRight bottomAlign"> <p><a href="qml-qdoc-test-abstractparent.html">AbstractParent</a></p> -</td></tr></table></div><ul> -<li><a href="qml-qdoc-test-child-members.html">List of all members, including inherited members</a></li> -</ul> -<h2 id="properties">Properties</h2> -<ul> -<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><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> -<!-- @@@Child --> -<h2>Property Documentation</h2> -<!-- $$$children --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -</div></div><!-- @@@children --> -<br/> -<!-- $$$name --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -</div></div><!-- @@@name --> -<br/> -<h2>Method Documentation</h2> -<!-- $$$name$$$name --> -<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> -<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> -</div></div><!-- @@@name --> -<br/> -<!-- $$$name[overload1]$$$nameChild --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -</div></div><!-- @@@name --> -<br/> -<!-- $$$rear[overload1]$$$rearChildvar --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -</div></div><!-- @@@rear --> -<br/> -</body> -</html> 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 deleted file mode 100644 index e16ba8519..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-doctest.html +++ /dev/null @@ -1,136 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- DocTest.qml --> - <title>DocTest QML Type | Test</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#properties">Properties</a></li> -<li class="level1"><a href="#signals">Signals</a></li> -<li class="level1"><a href="#methods">Methods</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -<li class="level2"><a href="#introduction">Introduction</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">DocTest QML Type</h1> -<!-- $$$DocTest-brief --> -<p>Represents a doc test case. <a href="#details">More...</a></p> -<!-- @@@DocTest --> -<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"> Since:</td><td class="memItemRight bottomAlign"> QDoc.Test 0.9</td></tr></table></div><ul> -<li><a href="qml-qdoc-test-doctest-members.html">List of all members, including inherited members</a></li> -</ul> -<h2 id="properties">Properties</h2> -<ul> -<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><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> -<li class="fn"><b><a href="qml-qdoc-test-doctest.html#itsHappening-signal">itsHappening</a></b>(bool <i>really</i>)</li> -</ul> -<h2 id="methods">Methods</h2> -<ul> -<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> -<h2 id="introduction">Introduction</h2> -<p>A documentation test case, itself documented inline in DocTest.qml.</p> -<!-- @@@DocTest --> -<h2>Property Documentation</h2> -<!-- $$$active --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -<p><b>See also </b><a href="qml-qdoc-test-doctest.html#name-prop">name</a>.</p> -</div></div><!-- @@@active --> -<br/> -<!-- $$$name --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -<pre class="qml"><span class="type"><a href="qml-qdoc-test-doctest.html">DocTest</a></span> { - <span class="name">name</span>: <span class="string">"test"</span> - <span class="comment">// ...</span> -}</pre> -</div></div><!-- @@@name --> -<br/> -<h2>Signal Documentation</h2> -<!-- $$$completed[overload1]$$$completed --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -</div></div><!-- @@@completed --> -<br/> -<!-- $$$foo[overload1]$$$foovar --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -<p><b>Note: </b>The corresponding handler is <code>onFoo</code>.</p> -</div></div><!-- @@@foo --> -<br/> -<!-- $$$itsHappening[overload1]$$$itsHappeningbool --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" id="itsHappening-signal"> -<td class="tblQmlFuncNode"><p> -<span class="name">itsHappening</span>(<span class="type">bool</span> <i>really</i>)</p></td></tr> -</table></div></div> -<div class="qmldoc"><p>Signals that something is <i>really</i> happening.</p> -<p><b>Note: </b>The corresponding handler is <code>onItsHappening</code>.</p> -</div></div><!-- @@@itsHappening --> -<br/> -<h2>Method Documentation</h2> -<!-- $$$fail[overload1]$$$fail --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -<p>This method was introduced in QDoc.Test 1.0.</p> -</div></div><!-- @@@fail --> -<br/> -<!-- $$$fail_hard[overload1]$$$fail_hard --> -<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> -<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> -<ul> -<li>Prints out <i>msg</i>.</li> -<li>Accepts a random <i>option</i>.</li> -</ul> -</div></div><!-- @@@fail_hard --> -<br/> -</body> -</html> 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 deleted file mode 100644 index bfbbb204d..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-members.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- type.cpp --> - <title>List of All Members for Type | Test</title> -</head> -<body> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<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><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><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 deleted file mode 100644 index 2c2e00b29..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-obsolete.html +++ /dev/null @@ -1,29 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- type.cpp --> - <title>Obsolete Members for Type | Test</title> -</head> -<body> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Obsolete Members for Type</h1> -<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><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> -<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> -<p>This method has no replacement This is a method that should include information about being deprecated and that it has been so since 6.2 in its docs.</p> -</div></div><!-- @@@deprecatedMethod --> -<br/> -</body> -</html> 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 deleted file mode 100644 index ecb295135..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html +++ /dev/null @@ -1,193 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- type.cpp --> - <title>Type QML Type | Test</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#properties">Properties</a></li> -<li class="level1"><a href="#attached-properties">Attached Properties</a></li> -<li class="level1"><a href="#signals">Signals</a></li> -<li class="level1"><a href="#attached-signals">Attached Signals</a></li> -<li class="level1"><a href="#methods">Methods</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Type QML Type</h1> -<!-- $$$Type-brief --> -<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="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><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><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><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><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><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><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> -<!-- @@@Type --> -<h2>Property Documentation</h2> -<!-- $$$ --> -<div class="qmlitem"><div class="fngroup"> -<div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -<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> -</div></div><!-- @@@ --> -<br/> -<!-- $$$group --> -<div class="qmlitem"><div class="qmlproto"> -<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> -<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> -<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> -<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> -</div></div><!-- @@@group --> -<br/> -<!-- $$$id --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -</div></div><!-- @@@id --> -<br/> -<!-- $$$name --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -</div></div><!-- @@@name --> -<br/> -<h2>Attached Property Documentation</h2> -<!-- $$$type --> -<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> -<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> -<tr><td class="topAlign"><code>Type.NoType</code></td><td class="topAlign">Nothing</td></tr> -<tr><td class="topAlign"><code>Type.SomeType</code></td><td class="topAlign">Something</td></tr> -</table></div> -</div></div><!-- @@@type --> -<br/> -<h2>Signal Documentation</h2> -<!-- $$$completed[overload1]$$$completedint --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -<p><b>Note: </b>The corresponding handler is <code>onCompleted</code>.</p> -</div></div><!-- @@@completed --> -<br/> -<!-- $$$group.created[overload1]$$$group.created --> -<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> -<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> -<p><b>Note: </b>The corresponding handler is <code>group.onCreated</code>.</p> -</div></div><!-- @@@group.created --> -<br/> -<h2>Attached Signal Documentation</h2> -<!-- $$$configured[overload1]$$$configured --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -<p><b>Note: </b>The corresponding handler is <code>onConfigured</code>.</p> -</div></div><!-- @@@configured --> -<br/> -<h2>Method Documentation</h2> -<!-- $$$ --> -<div class="qmlitem"><div class="fngroup"> -<div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -<span class="name">enable</span>()</p></td></tr> -</table></div></div> -</div><div class="qmldoc"><p>Enables or disables this type.</p> -</div></div><!-- @@@ --> -<br/> -<!-- $$$copy[overload1]$$$copy --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -</div></div><!-- @@@copy --> -<br/> -</body> -</html> 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 deleted file mode 100644 index 074fb30d9..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-yetanotherchild.html +++ /dev/null @@ -1,45 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- parent.qdoc --> - <title>YetAnotherChild QML Type | Test</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#properties">Properties</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">YetAnotherChild QML Type</h1> -<!-- $$$YetAnotherChild-brief --> -<p>A type inheriting from internal abstract parent. <a href="#details">More...</a></p> -<!-- @@@YetAnotherChild --> -<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></table></div><ul> -<li><a href="qml-qdoc-test-yetanotherchild-members.html">List of all members, including inherited members</a></li> -</ul> -<h2 id="properties">Properties</h2> -<ul> -<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> -<!-- @@@YetAnotherChild --> -<h2>Property Documentation</h2> -<!-- $$$prop --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -</div></div><!-- @@@prop --> -<br/> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-test-nover-typenoversion-members.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-test-nover-typenoversion-members.html deleted file mode 100644 index a9bf9cf1d..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-test-nover-typenoversion-members.html +++ /dev/null @@ -1,13 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- type.cpp --> - <title>List of All Members for TypeNoVersion | Test</title> -</head> -<body> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">List of All Members for TypeNoVersion</h1> -<p>This is the complete list of members for <a href="qml-test-nover-typenoversion.html">TypeNoVersion</a>, including inherited members.</p> -</body> -</html> 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 deleted file mode 100644 index 92cf4a514..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-test-nover-typenoversion.html +++ /dev/null @@ -1,29 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- type.cpp --> - <title>TypeNoVersion QML Type | Test</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">TypeNoVersion QML Type</h1> -<!-- $$$TypeNoVersion-brief --> -<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="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 --> -<h2 id="details">Detailed Description</h2> -<!-- @@@TypeNoVersion --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html deleted file mode 100644 index af59ed21d..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html +++ /dev/null @@ -1,94 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- ProgressBar.qml --> - <title>ProgressBar QML Type | Test</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#properties">Properties</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">ProgressBar QML Type</h1> -<!-- $$$ProgressBar-brief --> -<p>A component that shows the progress of an event. <a href="#details">More...</a></p> -<!-- @@@ProgressBar --> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> Import Statement:</td><td class="memItemRight bottomAlign"> import UIComponents 1.0</td></tr></table></div><ul> -<li><a href="qml-uicomponents-progressbar-members.html">List of all members, including inherited members</a></li> -</ul> -<h2 id="properties">Properties</h2> -<ul> -<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> -<p>A ProgressBar shows the linear progress of an event as its <a href="qml-uicomponents-progressbar.html#value-prop">value</a>. The range is specified using the <a href="qml-uicomponents-progressbar.html#minimum-prop">minimum</a> and the <a href="qml-uicomponents-progressbar.html#maximum-prop">maximum</a> values.</p> -<p>The ProgressBar component is part of the <a href="uicomponents-qmlmodule.html">UI Components</a> module.</p> -<p>This documentation is part of the <a href="test-componentset-example.html">UIComponents</a> example.</p> -<!-- @@@ProgressBar --> -<h2>Property Documentation</h2> -<!-- $$$color --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -<p><b>See also </b><a href="qml-uicomponents-progressbar.html#secondColor-prop">secondColor</a>.</p> -</div></div><!-- @@@color --> -<br/> -<!-- $$$maximum --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -</div></div><!-- @@@maximum --> -<br/> -<!-- $$$minimum --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -</div></div><!-- @@@minimum --> -<br/> -<!-- $$$secondColor --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -<p><b>See also </b><a href="qml-uicomponents-progressbar.html#color-prop">color</a>.</p> -</div></div><!-- @@@secondColor --> -<br/> -<!-- $$$value --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -</div></div><!-- @@@value --> -<br/> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html deleted file mode 100644 index b80835b63..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html +++ /dev/null @@ -1,64 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- Switch.qml --> - <title>Switch QML Type | Test</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#properties">Properties</a></li> -<li class="level1"><a href="#methods">Methods</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Switch QML Type</h1> -<!-- $$$Switch-brief --> -<p>A component that can be turned on or off. <a href="#details">More...</a></p> -<!-- @@@Switch --> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> Import Statement:</td><td class="memItemRight bottomAlign"> import UIComponents 1.0</td></tr></table></div><ul> -<li><a href="qml-uicomponents-switch-members.html">List of all members, including inherited members</a></li> -</ul> -<h2 id="properties">Properties</h2> -<ul> -<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><a href="qml-uicomponents-switch.html#toggle-method">toggle</a></b>()</li> -</ul> -<!-- $$$Switch-description --> -<h2 id="details">Detailed Description</h2> -<p>A toggle switch has two states: an <code>on</code> and an <code>off</code> state. The <code>off</code> state is when the <a href="qml-uicomponents-switch.html#on-prop">on</a> property is set to <code>false</code>.</p> -<p>The ToggleSwitch component is part of the <a href="uicomponents-qmlmodule.html">UI Components</a> module.</p> -<p>This documentation is part of the <a href="test-componentset-example.html">UIComponents</a> example.</p> -<!-- @@@Switch --> -<h2>Property Documentation</h2> -<!-- $$$on --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -</div></div><!-- @@@on --> -<br/> -<h2>Method Documentation</h2> -<!-- $$$toggle[overload1]$$$toggle --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -</div></div><!-- @@@toggle --> -<br/> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html deleted file mode 100644 index 1b0f37f84..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html +++ /dev/null @@ -1,80 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- TabWidget.qml --> - <title>TabWidget QML Type | Test</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#properties">Properties</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -<li class="level2"><a href="#adding-tabs">Adding Tabs</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">TabWidget QML Type</h1> -<!-- $$$TabWidget-brief --> -<p>A widget that places its children as tabs. <a href="#details">More...</a></p> -<!-- @@@TabWidget --> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> Import Statement:</td><td class="memItemRight bottomAlign"> import UIComponents 1.0</td></tr></table></div><ul> -<li><a href="qml-uicomponents-tabwidget-members.html">List of all members, including inherited members</a></li> -</ul> -<h2 id="properties">Properties</h2> -<ul> -<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> -<p>A TabWidget places its children as tabs in a view. Selecting a tab involves selecting the tab at the top.</p> -<p>The TabWidget component is part of the <a href="uicomponents-qmlmodule.html">UI Components</a> module.</p> -<p>This documentation is part of the <a href="test-componentset-example.html">UIComponents</a> example.</p> -<h2 id="adding-tabs">Adding Tabs</h2> -<p>To add a tab, declare the tab as a child of the TabWidget.</p> -<pre class="cpp">TabWidget { - id: tabwidget - - Rectangle { - id: tab1 - color: <span class="string">"red"</span> - <span class="comment">//... omitted</span> - } - Rectangle { - id: tab2 - color: <span class="string">"blue"</span> - <span class="comment">//... omitted</span> - } - -}</pre> -<!-- @@@TabWidget --> -<h2>Property Documentation</h2> -<!-- $$$current --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -</div></div><!-- @@@current --> -<br/> -<!-- $$$sampleReadOnlyProperty --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" 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> -<p>The signature is:</p> -<pre class="cpp">readonly property <span class="type"><a href="qml-int.html">int</a></span> sampleReadOnlyProperty: <span class="number">0</span></pre> -<p>Note that the property must be initialized to a value.</p> -</div></div><!-- @@@sampleReadOnlyProperty --> -<br/> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qmlmodules.html b/tests/auto/qdoc/generatedoutput/expected_output/qmlmodules.html deleted file mode 100644 index c45ae07e9..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/qmlmodules.html +++ /dev/null @@ -1,22 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- modules.qdoc --> - <title>QML Modules | Test</title> -</head> -<body> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">QML Modules</h1> -<!-- $$$qmlmodules.html-description --> -<div class="descr" id="details"> -<div class="table"><table class="annotated"> -<tr class="odd topAlign"><td class="tblName"><p><a href="test-empty-qmlmodule.html">No QML Types Here</a></p></td><td class="tblDescr"><p>A QML module with no member types.</p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="qdoc-test-qmlmodule.html">QDoc.Test QML Module</a></p></td><td class="tblDescr"><p>QML Types for the Test module.</p></td></tr> -<tr class="odd topAlign"><td class="tblName"><p><a href="uicomponents-qmlmodule.html">UI Components</a></p></td><td class="tblDescr"><p>Basic set of UI components.</p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="test-nover-qmlmodule.html">Versionless QML Module</a></p></td><td class="tblDescr"><p>QML Types for the Test module without version.</p></td></tr> -</table></div> -</div> -<!-- @@@qmlmodules.html --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups-docbook/qml-qdoc-test-parent.xml b/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups-docbook/qml-qdoc-test-parent.xml deleted file mode 100644 index de88d4e07..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups-docbook/qml-qdoc-test-parent.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>Parent QML Type</db:title> -<db:productname>QmlPropertyGroups</db:productname> -<db:titleabbrev>A test project for QDoc build artifacts</db:titleabbrev> -<db:abstract> -<db:para>Base QML type.</db:para> -</db:abstract> -</db:info> -<db:variablelist> -<db:varlistentry> -<db:term>Import Statement</db:term> -<db:listitem> -<db:para>import QDoc.Test 1.1</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term>Inherited By:</db:term> -<db:listitem> -<db:para><db:link xlink:href="qml-qdoc-test-anotherchild.xml" xlink:role="">AnotherChild</db:link></db:para> -</db:listitem> -</db:varlistentry> -</db:variablelist> -<db:section xml:id="details"> -<db:title>Detailed Description</db:title> -</db:section> -<db:section xml:id="property-documentation"> -<db:title>Property Documentation</db:title> -<db:section xml:id="group-prop"> -<db:title>group group</db:title> -<db:bridgehead renderas="sect2" xml:id="group.a-prop">group.a : int</db:bridgehead> -<db:fieldsynopsis> -<db:type>int</db:type> -<db:varname>group.a</db:varname> -<db:modifier>writable</db:modifier> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:fieldsynopsis> -<db:bridgehead renderas="sect2" xml:id="group.b-prop">[read-only] group.b : int</db:bridgehead> -<db:fieldsynopsis> -<db:type>int</db:type> -<db:varname>group.b</db:varname> -<db:modifier>[read-only]</db:modifier> - -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:fieldsynopsis> -<db:bridgehead renderas="sect2" xml:id="group.c-prop">[since 2.0] group.c : int</db:bridgehead> -<db:fieldsynopsis> -<db:type>int</db:type> -<db:varname>group.c</db:varname> -<db:modifier>writable</db:modifier> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:fieldsynopsis> -<db:para>Property group.</db:para> -</db:section> -</db:section> -</db:article> 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 deleted file mode 100644 index 108db2ea7..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-anotherchild-members.html +++ /dev/null @@ -1,25 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- parent.qdoc --> - <title>List of All Members for AnotherChild | QmlPropertyGroups</title> -</head> -<body> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<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><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><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> -</body> -</html> 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 deleted file mode 100644 index 479ac12b0..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-parent.html +++ /dev/null @@ -1,58 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- parent.qdoc --> - <title>Parent QML Type | QmlPropertyGroups</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#properties">Properties</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Parent QML Type</h1> -<!-- $$$Parent-brief --> -<p>Base QML type. <a href="#details">More...</a></p> -<!-- @@@Parent --> -<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"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="qml-qdoc-test-anotherchild.html">AnotherChild</a></p> -</td></tr></table></div><ul> -<li><a href="qml-qdoc-test-parent-members.html">List of all members, including inherited members</a></li> -</ul> -<h2 id="properties">Properties</h2> -<ul> -<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> -<!-- $$$Parent-description --> -<h2 id="details">Detailed Description</h2> -<!-- @@@Parent --> -<h2>Property Documentation</h2> -<!-- $$$group --> -<div class="qmlitem"><div class="qmlproto"> -<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> -<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> -<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> -<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> -</div></div><!-- @@@group --> -<br/> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum-docbook/scoped-enum-linking.xml b/tests/auto/qdoc/generatedoutput/expected_output/scopedenum-docbook/scoped-enum-linking.xml deleted file mode 100644 index f5c4a05cd..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum-docbook/scoped-enum-linking.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>Enum Linking</db:title> -<db:productname>TestCPP</db:productname> -<db:titleabbrev>TestCPP Reference Documentation</db:titleabbrev> -<db:abstract> -<db:para>TestCPP Reference Documentation.</db:para></db:abstract> -</db:info> -<db:para>Linking to <db:link xlink:href="testqdoc-test.xml#ScopedEnum-enum">All</db:link>.</db:para> -<db:para>TestQDoc::Test::ClassicEnum::Howdy does not link, but <db:link xlink:href="testqdoc-test.xml#ClassicEnum-enum">TestQDoc::Test::Howdy</db:link> might.</db:para> -</db:article> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum-docbook/testqdoc-test.xml b/tests/auto/qdoc/generatedoutput/expected_output/scopedenum-docbook/testqdoc-test.xml deleted file mode 100644 index 07d6cb54c..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum-docbook/testqdoc-test.xml +++ /dev/null @@ -1,387 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>Test Class</db:title> -<db:subtitle>TestQDoc::Test</db:subtitle> -<db:productname>TestCPP</db:productname> -<db:titleabbrev>TestCPP Reference Documentation</db:titleabbrev> -<db:abstract> -<db:para>A class in a namespace.</db:para> -</db:abstract> -</db:info> -<db:variablelist> -<db:varlistentry> -<db:term>Header</db:term> -<db:listitem> -<db:para>Test</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term>CMake</db:term> -<db:listitem> -<db:para>find_package(Qt6 COMPONENTS QDocTest REQUIRED)</db:para> -<db:para>target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term>qmake</db:term> -<db:listitem> -<db:para>QT += testcpp</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term>Inherited By</db:term> -<db:listitem> -<db:para><db:link xlink:href="testqdoc-testderived.xml" xlink:role="class">TestQDoc::TestDerived</db:link></db:para> -</db:listitem> -</db:varlistentry> -</db:variablelist> -<db:section xml:id="details"> -<db:title>Detailed Description</db:title> -</db:section> -<db:section xml:id="member-type-documentation"> -<db:title>Member Type Documentation</db:title> -<db:section xml:id="ClassicEnum-enum"> -<db:title>Test::enum ClassicEnum</db:title> -<db:enumsynopsis> -<db:enumname>ClassicEnum</db:enumname> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:enumitem db:enumidentifier="Yee" db:enumvalue="0"/> -<db:enumitem db:enumidentifier="Haw" db:enumvalue="1"/> -<db:enumitem db:enumidentifier="Howdy" db:enumvalue="2"/> -<db:enumitem db:enumidentifier="Partner" db:enumvalue="3"/> -</db:enumsynopsis> -<db:informaltable> -<db:thead> -<db:tr> -<db:th>Constant</db:th> -<db:th>Description</db:th> -</db:tr> -</db:thead> -<db:tr> -<db:td> -<db:para><db:code><db:emphasis role="bold"><db:link xlink:href="testqdoc.xml">TestQDoc</db:link></db:emphasis>::<db:emphasis role="bold"><db:link xlink:href="testqdoc-test.xml">Test</db:link></db:emphasis>::Yee</db:code></db:para> -</db:td> -<db:td><db:code>0</db:code></db:td> -</db:tr> -<db:tr> -<db:td> -<db:para><db:code><db:emphasis role="bold"><db:link xlink:href="testqdoc.xml">TestQDoc</db:link></db:emphasis>::<db:emphasis role="bold"><db:link xlink:href="testqdoc-test.xml">Test</db:link></db:emphasis>::Haw</db:code></db:para> -</db:td> -<db:td><db:code>1</db:code></db:td> -</db:tr> -<db:tr> -<db:td> -<db:para><db:code><db:emphasis role="bold"><db:link xlink:href="testqdoc.xml">TestQDoc</db:link></db:emphasis>::<db:emphasis role="bold"><db:link xlink:href="testqdoc-test.xml">Test</db:link></db:emphasis>::Howdy</db:code></db:para> -</db:td> -<db:td><db:code>2</db:code></db:td> -</db:tr> -<db:tr> -<db:td> -<db:para><db:code><db:emphasis role="bold"><db:link xlink:href="testqdoc.xml">TestQDoc</db:link></db:emphasis>::<db:emphasis role="bold"><db:link xlink:href="testqdoc-test.xml">Test</db:link></db:emphasis>::Partner</db:code></db:para> -</db:td> -<db:td><db:code>3</db:code></db:td> -</db:tr> -</db:informaltable> -</db:section> -<db:section xml:id="ScopedEnum-enum"> -<db:title>Test::enum ScopedEnum</db:title> -<db:enumsynopsis> -<db:enumname>ScopedEnum</db:enumname> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:enumitem db:enumidentifier="This" db:enumvalue="0x01"/> -<db:enumitem db:enumidentifier="That" db:enumvalue="0x02"/> -<db:enumitem db:enumidentifier="All" db:enumvalue="This | That"/> -<db:enumitem db:enumidentifier="OmittedValue" db:enumvalue="99"/> -<db:enumitem db:enumidentifier="UselessValue" db:enumvalue="100"/> -<db:enumitem db:enumidentifier="VeryLastValue" db:enumvalue="101"/> -</db:enumsynopsis> -<db:informaltable> -<db:thead> -<db:tr> -<db:th>Constant</db:th> -<db:th>Value</db:th> -<db:th>Description</db:th> -</db:tr> -</db:thead> -<db:tr> -<db:td> -<db:para><db:code><db:emphasis role="bold"><db:link xlink:href="testqdoc.xml">TestQDoc</db:link></db:emphasis>::<db:emphasis role="bold"><db:link xlink:href="testqdoc-test.xml">Test</db:link></db:emphasis>::<db:emphasis role="bold"><db:link xlink:href="">ScopedEnum</db:link></db:emphasis>::This</db:code></db:para> -</db:td> -<db:td><db:code>0x01</db:code></db:td> -<db:td> -<db:para>Something</db:para> -</db:td> -</db:tr> -<db:tr> -<db:td> -<db:para><db:code><db:emphasis role="bold"><db:link xlink:href="testqdoc.xml">TestQDoc</db:link></db:emphasis>::<db:emphasis role="bold"><db:link xlink:href="testqdoc-test.xml">Test</db:link></db:emphasis>::<db:emphasis role="bold"><db:link xlink:href="">ScopedEnum</db:link></db:emphasis>::That</db:code></db:para> -</db:td> -<db:td><db:code>0x02</db:code></db:td> -<db:td> -<db:para>Something else</db:para> -</db:td> -</db:tr> -<db:tr> -<db:td> -<db:para><db:code><db:emphasis role="bold"><db:link xlink:href="testqdoc.xml">TestQDoc</db:link></db:emphasis>::<db:emphasis role="bold"><db:link xlink:href="testqdoc-test.xml">Test</db:link></db:emphasis>::<db:emphasis role="bold"><db:link xlink:href="">ScopedEnum</db:link></db:emphasis>::All</db:code></db:para> -</db:td> -<db:td><db:code>This | That</db:code></db:td> -<db:td> -<db:para>Everything</db:para> -</db:td> -</db:tr> -</db:informaltable> -<db:para>A scoped enum.</db:para> -</db:section> -<db:section xml:id="SomeType-typedef"> -<db:title>Test::SomeType</db:title> -<db:typedefsynopsis> -<db:type>SomeType</db:type><db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:typedefsynopsis> -<db:para>A typedef.</db:para> -</db:section> -</db:section> -<db:section xml:id="member-function-documentation"> -<db:title>Member Function Documentation</db:title> -<db:section xml:id="overload"> -<db:title>[protected] Test::void overload()</db:title> -<db:bridgehead renderas="sect2" xml:id="overload-1">[protected, since Test 1.2] Test::void overload(bool <db:emphasis>b</db:emphasis>)</db:bridgehead> -<db:para>Overloads that share a documentation comment, optionally taking a parameter <db:code role="parameter">b</db:code>.</db:para> -</db:section> -<db:section xml:id="Test"> -<db:title>[default] Test::Test()</db:title> -<db:constructorsynopsis> -<db:type></db:type> -<db:methodname>Test</db:methodname> -<db:modifier>default</db:modifier> -<db:void/> -<db:synopsisinfo db:role="meta">constructor</db:synopsisinfo> -<db:synopsisinfo db:role="signature">Test() = default</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:constructorsynopsis> -<db:para>Default constructor.</db:para> -</db:section> -<db:section xml:id="operator-eq"> -<db:title>[default] Test::TestQDoc::Test &operator=(TestQDoc::Test &&<db:emphasis>other</db:emphasis>)</db:title> -<db:methodsynopsis> -<db:type>TestQDoc::Test &</db:type> -<db:methodname>operator=</db:methodname> -<db:modifier>default</db:modifier> -<db:methodparam> -<db:type>TestQDoc::Test &&</db:type> -<db:parameter>other</db:parameter> -</db:methodparam> -<db:synopsisinfo db:role="meta">move-assign</db:synopsisinfo> -<db:synopsisinfo db:role="signature">TestQDoc::Test & operator=(TestQDoc::Test &&other) = default</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -<db:para>Move-assigns <db:code role="parameter">other</db:code>.</db:para> -</db:section> -<db:section xml:id="funcPtr"> -<db:title>Test::void (*)(bool) funcPtr(bool <db:emphasis>b</db:emphasis>, const char *<db:emphasis>s</db:emphasis>)</db:title> -<db:methodsynopsis> -<db:type>void (*)(bool)</db:type> -<db:methodname>funcPtr</db:methodname> -<db:methodparam> -<db:type>bool</db:type> -<db:parameter>b</db:parameter> -</db:methodparam> -<db:methodparam> -<db:type>const char *</db:type> -<db:parameter>s</db:parameter> -</db:methodparam> -<db:synopsisinfo db:role="meta">plain</db:synopsisinfo> -<db:synopsisinfo db:role="signature">void (*)(bool) funcPtr(bool b, const char *s)</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -<db:para>Returns a pointer to a function that takes a boolean. Uses <db:code role="parameter">b</db:code> and <db:code role="parameter">s</db:code>.</db:para> -</db:section> -<db:section xml:id="inlineFunction"> -<db:title>Test::void inlineFunction()</db:title> -<db:methodsynopsis> -<db:void/> -<db:methodname>inlineFunction</db:methodname> -<db:void/> -<db:synopsisinfo db:role="meta">plain</db:synopsisinfo> -<db:synopsisinfo db:role="signature">void inlineFunction()</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -<db:para>An inline function, documented using the \fn QDoc command.</db:para> -</db:section> -<db:section xml:id="someFunction"> -<db:title>Test::int someFunction(<db:emphasis>int</db:emphasis>, int <db:emphasis>v</db:emphasis> = 0)</db:title> -<db:methodsynopsis> -<db:type>int</db:type> -<db:methodname>someFunction</db:methodname> -<db:methodparam> -<db:type>int</db:type> -<db:parameter></db:parameter> -</db:methodparam> -<db:methodparam> -<db:type>int</db:type> -<db:parameter>v</db:parameter> -<db:initializer>0</db:initializer> -</db:methodparam> -<db:synopsisinfo db:role="meta">plain</db:synopsisinfo> -<db:synopsisinfo db:role="signature">int someFunction(int, int v)</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -<db:para>Function that takes a parameter <db:code role="parameter">v</db:code>. Also returns the value of <db:code role="parameter">v</db:code>.</db:para> -</db:section> -<db:section xml:id="someFunctionDefaultArg"> -<db:title>Test::void someFunctionDefaultArg(int <db:emphasis>i</db:emphasis>, bool <db:emphasis>b</db:emphasis> = false)</db:title> -<db:methodsynopsis> -<db:void/> -<db:methodname>someFunctionDefaultArg</db:methodname> -<db:methodparam> -<db:type>int</db:type> -<db:parameter>i</db:parameter> -</db:methodparam> -<db:methodparam> -<db:type>bool</db:type> -<db:parameter>b</db:parameter> -<db:initializer>false</db:initializer> -</db:methodparam> -<db:synopsisinfo db:role="meta">plain</db:synopsisinfo> -<db:synopsisinfo db:role="signature">void someFunctionDefaultArg(int i, bool b)</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -<db:para>Function that takes a parameter <db:code role="parameter">i</db:code> and <db:code role="parameter">b</db:code>.</db:para> -</db:section> -<db:section xml:id="virtualFun"> -<db:title>[virtual] Test::void virtualFun()</db:title> -<db:methodsynopsis> -<db:modifier>virtual</db:modifier> -<db:void/> -<db:methodname>virtualFun</db:methodname> -<db:void/> -<db:synopsisinfo db:role="meta">plain</db:synopsisinfo> -<db:synopsisinfo db:role="signature">void virtualFun()</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -<db:para>Function that must be reimplemented.</db:para> -</db:section> -</db:section> -<db:section xml:id="related-non-members"> -<db:title>Related Non-Members</db:title> -<db:section xml:id="operator-eq-eq"> -<db:title>bool operator==(const TestQDoc::Test &<db:emphasis>lhs</db:emphasis>, const TestQDoc::Test &<db:emphasis>rhs</db:emphasis>)</db:title> -<db:methodsynopsis> -<db:type>bool</db:type> -<db:methodname>operator==</db:methodname> -<db:methodparam> -<db:type>const TestQDoc::Test &</db:type> -<db:parameter>lhs</db:parameter> -</db:methodparam> -<db:methodparam> -<db:type>const TestQDoc::Test &</db:type> -<db:parameter>rhs</db:parameter> -</db:methodparam> -<db:synopsisinfo db:role="meta">plain</db:synopsisinfo> -<db:synopsisinfo db:role="signature">bool operator==(const TestQDoc::Test &lhs, const TestQDoc::Test &rhs)</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -<db:para>Returns true if <db:code role="parameter">lhs</db:code> and <db:code role="parameter">rhs</db:code> are equal.</db:para> -</db:section> -</db:section> -<db:section xml:id="macro-documentation"> -<db:title>Macro Documentation</db:title> -<db:section xml:id="QDOCTEST_MACRO2"> -<db:title>[since Test 1.1] QDOCTEST_MACRO2(int &<db:emphasis>x</db:emphasis>)</db:title> -<db:methodsynopsis> -<db:methodname>QDOCTEST_MACR</db:methodname> -<db:methodparam> -<db:type>int &</db:type> -<db:parameter>x</db:parameter> -</db:methodparam> -<db:synopsisinfo db:role="meta">macrowithparams</db:synopsisinfo> -<db:synopsisinfo db:role="signature">QDOCTEST_MACRO2(int &x)</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">active</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -<db:para>A macro with argument <db:code role="parameter">x</db:code>.</db:para> -<db:para>This function was introduced in Test 1.1.</db:para> -</db:section> -</db:section> -<db:section xml:id="obsolete"> -<db:title>Obsolete Members for Test</db:title> -<db:para><db:emphasis role="bold">The following members of class <db:link xlink:href="testqdoc-test.xml">Test</db:link> are deprecated.</db:emphasis> We strongly advise against using them in new code.</db:para> -<db:section xml:id="member-function-documentation"> -<db:title>Member Function Documentation</db:title> -<db:section xml:id="operator-2b-2b"> -<db:title>Test::TestQDoc::Test &operator++()</db:title> -<db:bridgehead renderas="sect2" xml:id="operator--">Test::TestQDoc::Test &operator--()</db:bridgehead> -<db:para>This function is deprecated. We strongly advise against using it in new code.</db:para> -</db:section> -<db:section xml:id="anotherObsoleteMember"> -<db:title>Test::void anotherObsoleteMember()</db:title> -<db:methodsynopsis> -<db:void/> -<db:methodname>anotherObsoleteMember</db:methodname> -<db:void/> -<db:synopsisinfo db:role="meta">plain</db:synopsisinfo> -<db:synopsisinfo db:role="signature">void anotherObsoleteMember()</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">deprecated</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -<db:para>This function is deprecated. We strongly advise against using it in new code.</db:para> -<db:para>Use <db:link xlink:href="testqdoc-test.xml#obsoleteMember">obsoleteMember</db:link>() instead.</db:para> -</db:section> -<db:section xml:id="deprecatedMember"> -<db:title>Test::void deprecatedMember()</db:title> -<db:methodsynopsis> -<db:void/> -<db:methodname>deprecatedMember</db:methodname> -<db:void/> -<db:synopsisinfo db:role="meta">plain</db:synopsisinfo> -<db:synopsisinfo db:role="signature">void deprecatedMember()</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">deprecated</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -<db:para>This function is deprecated since 6.0. We strongly advise against using it in new code.</db:para> -<db:para>Use <db:link xlink:href="testqdoc-test.xml#someFunction">someFunction</db:link>() instead.</db:para> -</db:section> -<db:section xml:id="obsoleteMember"> -<db:title>Test::void obsoleteMember()</db:title> -<db:methodsynopsis> -<db:void/> -<db:methodname>obsoleteMember</db:methodname> -<db:void/> -<db:synopsisinfo db:role="meta">plain</db:synopsisinfo> -<db:synopsisinfo db:role="signature">void obsoleteMember()</db:synopsisinfo> -<db:synopsisinfo db:role="access">public</db:synopsisinfo> -<db:synopsisinfo db:role="status">deprecated</db:synopsisinfo> -<db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -</db:methodsynopsis> -<db:para>This function is deprecated. We strongly advise against using it in new code.</db:para> -<db:para>Use <db:link xlink:href="testqdoc-test.xml#someFunction">someFunction</db:link>() instead.</db:para> -</db:section> -</db:section> -</db:section> -</db:article> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/scoped-enum-linking.html b/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/scoped-enum-linking.html deleted file mode 100644 index a663df7ab..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/scoped-enum-linking.html +++ /dev/null @@ -1,18 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- scopedenum.qdoc --> - <title>Enum Linking | TestCPP</title> -</head> -<body> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Enum Linking</h1> -<!-- $$$scoped-enum-linking.html-description --> -<div class="descr" id="details"> -<p>Linking to <a href="testqdoc-test.html#ScopedEnum-enum">All</a>.</p> -<p>TestQDoc::Test::ClassicEnum::Howdy does not link, but <a href="testqdoc-test.html#ClassicEnum-enum">TestQDoc::Test::Howdy</a> might.</p> -</div> -<!-- @@@scoped-enum-linking.html --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html b/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html deleted file mode 100644 index 68fc28ac6..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html +++ /dev/null @@ -1,148 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testcpp.cpp --> - <title>Test Class | TestCPP</title> -</head> -<body> -<li>Test</li> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#public-types">Public Types</a></li> -<li class="level1"><a href="#public-functions">Public Functions</a></li> -<li class="level1"><a href="#protected-functions">Protected Functions</a></li> -<li class="level1"><a href="#related-non-members">Related Non-Members</a></li> -<li class="level1"><a href="#macros">Macros</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Test Class</h1> -<span class="small-subtitle">class <a href="testqdoc.html">TestQDoc</a>::Test</span> -<!-- $$$Test-brief --> -<p>A class in a namespace. <a href="#details">More...</a></p> -<!-- @@@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><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> -<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> -<h2 id="public-types">Public Types</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> enum </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#ClassicEnum-enum">ClassicEnum</a></b> { Yee, Haw, Howdy, Partner }</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> enum class </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#ScopedEnum-enum">ScopedEnum</a></b> { This, That, All }</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#SomeType-typedef">SomeType</a></b></td></tr> -</table></div> -<h2 id="public-functions">Public Functions</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#Test">Test</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> TestQDoc::Test &</td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#operator-eq">operator=</a></b>(TestQDoc::Test &&<i>other</i>)</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void (*)(bool) </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#funcPtr">funcPtr</a></b>(bool <i>b</i>, const char *<i>s</i>)</td></tr> -<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, int <i>v</i> = 0)</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> -<tr><td class="memItemLeft rightAlign topAlign"> virtual void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#virtualFun">virtualFun</a></b>()</td></tr> -</table></div> -<h2 id="protected-functions">Protected 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#overload">overload</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#overload-1">overload</a></b>(bool <i>b</i>)</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"> bool </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#operator-eq-eq">operator==</a></b>(const TestQDoc::Test &<i>lhs</i>, const TestQDoc::Test &<i>rhs</i>)</td></tr> -</table></div> -<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> -</table></div> -<!-- $$$Test-description --> -<div class="descr"> -<h2 id="details">Detailed Description</h2> -</div> -<!-- @@@Test --> -<div class="types"> -<h2>Member Type Documentation</h2> -<!-- $$$ClassicEnum$$$Yee$$$Haw$$$Howdy$$$Partner --> -<h3 class="fn" id="ClassicEnum-enum">enum Test::<span class="name">ClassicEnum</span></h3> -<div class="table"><table class="valuelist"><tr><th class="tblConst">Constant</th><th class="tblVal">Value</th></tr> -<tr><td class="topAlign"><code>TestQDoc::Test::Yee</code></td><td class="topAlign tblval"><code>0</code></td></tr> -<tr><td class="topAlign"><code>TestQDoc::Test::Haw</code></td><td class="topAlign tblval"><code>1</code></td></tr> -<tr><td class="topAlign"><code>TestQDoc::Test::Howdy</code></td><td class="topAlign tblval"><code>2</code></td></tr> -<tr><td class="topAlign"><code>TestQDoc::Test::Partner</code></td><td class="topAlign tblval"><code>3</code></td></tr> -</table></div> -<!-- @@@ClassicEnum --> -<!-- $$$ScopedEnum$$$This$$$That$$$All$$$OmittedValue$$$UselessValue$$$VeryLastValue --> -<h3 class="fn" id="ScopedEnum-enum">enum class Test::<span class="name">ScopedEnum</span></h3> -<div class="table"><table class="valuelist"><tr valign="top" class="odd"><th class="tblConst">Constant</th><th class="tblval">Value</th><th class="tbldscr">Description</th></tr> -<tr><td class="topAlign"><code>TestQDoc::Test::ScopedEnum::This</code></td><td class="topAlign tblval"><code>0x01</code></td><td class="topAlign">Something</td></tr> -<tr><td class="topAlign"><code>TestQDoc::Test::ScopedEnum::That</code></td><td class="topAlign tblval"><code>0x02</code></td><td class="topAlign">Something else</td></tr> -<tr><td class="topAlign"><code>TestQDoc::Test::ScopedEnum::All</code></td><td class="topAlign tblval"><code>This | That</code></td><td class="topAlign">Everything</td></tr> -</table></div> -<p>A scoped enum.</p> -<!-- @@@ScopedEnum --> -<!-- $$$SomeType --> -<h3 class="fn" id="SomeType-typedef">Test::<span class="name">SomeType</span></h3> -<p>A typedef.</p> -<!-- @@@SomeType --> -</div> -<div class="func"> -<h2>Member Function Documentation</h2> -<!-- $$$ --> -<div class="fngroup"> -<h3 class="fn fngroupitem" id="overload"><code>[protected] </code><span class="type">void</span> Test::<span class="name">overload</span>()</h3><h3 class="fn fngroupitem" id="overload-1"><code>[protected, since Test 1.2] </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> -<!-- @@@ --> -<!-- $$$Test[overload1]$$$Test --> -<h3 class="fn" id="Test"><code>[default] </code>Test::<span class="name">Test</span>()</h3> -<p>Default constructor.</p> -<!-- @@@Test --> -<!-- $$$operator=[overload1]$$$operator=TestQDoc::Test&& --> -<h3 class="fn" id="operator-eq"><code>[default] </code><span class="type"><a href="testqdoc-test.html">TestQDoc::Test</a></span> &Test::<span class="name">operator=</span>(<span class="type"><a href="testqdoc-test.html">TestQDoc::Test</a></span> &&<i>other</i>)</h3> -<p>Move-assigns <i>other</i>.</p> -<!-- @@@operator= --> -<!-- $$$funcPtr[overload1]$$$funcPtrboolconstchar* --> -<h3 class="fn" id="funcPtr"><span class="type">void</span> (*)(<span class="type">bool</span>) Test::<span class="name">funcPtr</span>(<span class="type">bool</span> <i>b</i>, const <span class="type">char</span> *<i>s</i>)</h3> -<p>Returns a pointer to a function that takes a boolean. Uses <i>b</i> and <i>s</i>.</p> -<!-- @@@funcPtr --> -<!-- $$$inlineFunction[overload1]$$$inlineFunction --> -<h3 class="fn" id="inlineFunction"><span class="type">void</span> Test::<span class="name">inlineFunction</span>()</h3> -<p>An inline function, documented using the \fn QDoc command.</p> -<!-- @@@inlineFunction --> -<!-- $$$someFunction[overload1]$$$someFunctionintint --> -<h3 class="fn" id="someFunction"><span class="type">int</span> Test::<span class="name">someFunction</span>(<span class="type">int</span>, <span class="type">int</span> <i>v</i> = 0)</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"><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 --> -<!-- $$$virtualFun[overload1]$$$virtualFun --> -<h3 class="fn" id="virtualFun"><code>[virtual] </code><span class="type">void</span> Test::<span class="name">virtualFun</span>()</h3> -<p>Function that must be reimplemented.</p> -<!-- @@@virtualFun --> -</div> -<div class="relnonmem"> -<h2>Related Non-Members</h2> -<!-- $$$operator==[overload1]$$$operator==constTestQDoc::Test&constTestQDoc::Test& --> -<h3 class="fn" id="operator-eq-eq"><span class="type">bool</span> <span class="name">operator==</span>(const <span class="type"><a href="testqdoc-test.html">TestQDoc::Test</a></span> &<i>lhs</i>, const <span class="type"><a href="testqdoc-test.html">TestQDoc::Test</a></span> &<i>rhs</i>)</h3> -<p>Returns true if <i>lhs</i> and <i>rhs</i> are equal.</p> -<!-- @@@operator== --> -</div> -<div class="macros"> -<h2>Macro Documentation</h2> -<!-- $$$QDOCTEST_MACRO2[overload1]$$$QDOCTEST_MACRO2int& --> -<h3 class="fn" id="QDOCTEST_MACRO2"><code>[since Test 1.1] </code><span class="name">QDOCTEST_MACRO2</span>(<span class="type">int</span> &<i>x</i>)</h3> -<p>A macro with argument <i>x</i>.</p> -<p>This function was introduced in Test 1.1.</p> -<!-- @@@QDOCTEST_MACRO2 --> -</div> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/second.html b/tests/auto/qdoc/generatedoutput/expected_output/second.html deleted file mode 100644 index b932dc7fa..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/second.html +++ /dev/null @@ -1,29 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- main.cpp --> - <title>Second Class | TestModule</title> -</head> -<body> -<li>Second</li> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<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> -<!-- $$$Second-description --> -<div class="descr"> -<h2 id="details">Detailed Description</h2> -<p>This is a second class</p> -</div> -<!-- @@@Second --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/space.html b/tests/auto/qdoc/generatedoutput/expected_output/space.html deleted file mode 100644 index c84aae428..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/space.html +++ /dev/null @@ -1,42 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- space.cpp --> - <title>Space Namespace | UsingDirective</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#functions">Functions</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Space Namespace</h1> -<!-- $$$Space-brief --> -<p>A namespace...in space. <a href="#details">More...</a></p> -<!-- @@@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> -<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> -</table></div> -<!-- $$$Space-description --> -<div class="descr"> -<h2 id="details">Detailed Description</h2> -</div> -<!-- @@@Space --> -<div class="func"> -<h2>Function Documentation</h2> -<!-- $$$spaceFun[overload1]$$$spaceFunSpace::spacename --> -<h3 class="fn" id="spaceFun"><span class="type">void</span> <span class="name">spaceFun</span>(<span class="type">Space::spacename</span> <i>space</i>)</h3> -<p>A <i>space</i> function.</p> -<!-- @@@spaceFun --> -</div> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/bar.html b/tests/auto/qdoc/generatedoutput/expected_output/template/bar.html deleted file mode 100644 index 88185435c..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/template/bar.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testtemplate.cpp --> - <title>Bar Class | TestCPP</title> -</head> -<body> -<li>Bar</li> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Bar Class</h1> -<span class="small-subtitle">template <typename T, typename D> class Bar</span> -<!-- $$$Bar-brief --> -<p>Another class template. <a href="#details">More...</a></p> -<!-- @@@Bar --> -<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> -<!-- $$$Bar-description --> -<div class="descr"> -<h2 id="details">Detailed Description</h2> -</div> -<!-- @@@Bar --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/baz.html b/tests/auto/qdoc/generatedoutput/expected_output/template/baz.html deleted file mode 100644 index 482c5b02d..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/template/baz.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testtemplate.cpp --> - <title>Baz Struct | TestCPP</title> -</head> -<body> -<li>Baz</li> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Baz Struct</h1> -<span class="small-subtitle">template <template <typename> class X, typename Y> struct Baz</span> -<!-- $$$Baz-brief --> -<p>Class template template. <a href="#details">More...</a></p> -<!-- @@@Baz --> -<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> -<!-- $$$Baz-description --> -<div class="descr"> -<h2 id="details">Detailed Description</h2> -</div> -<!-- @@@Baz --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/foo.html b/tests/auto/qdoc/generatedoutput/expected_output/template/foo.html deleted file mode 100644 index 84a7be7dd..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/template/foo.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testtemplate.cpp --> - <title>Foo Class | TestCPP</title> -</head> -<body> -<li>Foo</li> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Foo Class</h1> -<span class="small-subtitle">template <typename T> class Foo</span> -<!-- $$$Foo-brief --> -<p>Class template. <a href="#details">More...</a></p> -<!-- @@@Foo --> -<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> -<!-- $$$Foo-description --> -<div class="descr"> -<h2 id="details">Detailed Description</h2> -</div> -<!-- @@@Foo --> -</body> -</html> 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 deleted file mode 100644 index 1e4a40e2a..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test-struct.html +++ /dev/null @@ -1,29 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testcpp.cpp --> - <title>Struct Struct | TestCPP</title> -</head> -<body> -<li>Struct</li> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Struct Struct</h1> -<span class="small-subtitle">template <typename D, typename T> struct <a href="testqdoc.html">TestQDoc</a>::<a href="testqdoc-test.html">Test</a>::Struct</span> -<!-- $$$Struct-brief --> -<p>Templated struct. <a href="#details">More...</a></p> -<!-- @@@Struct --> -<!-- $$$Struct-description --> -<div class="descr"> -<h2 id="details">Detailed Description</h2> -</div> -<!-- @@@Struct --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test.html b/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test.html deleted file mode 100644 index 51f9275fa..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test.html +++ /dev/null @@ -1,143 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testcpp.cpp --> - <title>Test Class | TestCPP</title> -</head> -<body> -<li>Test</li> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#public-types">Public Types</a></li> -<li class="level1"><a href="#public-functions">Public Functions</a></li> -<li class="level1"><a href="#protected-functions">Protected Functions</a></li> -<li class="level1"><a href="#related-non-members">Related Non-Members</a></li> -<li class="level1"><a href="#macros">Macros</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Test Class</h1> -<span class="small-subtitle">class <a href="testqdoc.html">TestQDoc</a>::Test</span> -<!-- $$$Test-brief --> -<p>A class in a namespace. <a href="#details">More...</a></p> -<!-- @@@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><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> -<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> -<h2 id="public-types">Public Types</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> struct </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test-struct.html">Struct</a></b></td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#SomeType-typedef">SomeType</a></b></td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#Specialized-typedef">Specialized</a></b></td></tr> -</table></div> -<h2 id="public-functions">Public Functions</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#Test">Test</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> TestQDoc::Test &</td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#operator-eq">operator=</a></b>(TestQDoc::Test &&<i>other</i>)</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void (*)(bool) </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#funcPtr">funcPtr</a></b>(bool <i>b</i>, const char *<i>s</i>)</td></tr> -<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, int <i>v</i> = 0)</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> -<tr><td class="memItemLeft rightAlign topAlign"> virtual void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#virtualFun">virtualFun</a></b>()</td></tr> -</table></div> -<h2 id="protected-functions">Protected 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#funcTemplate">funcTemplate</a></b>(T1 <i>a</i>, T2 <i>b</i>)</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#overload">overload</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#overload-1">overload</a></b>(bool <i>b</i>)</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"> bool </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#operator-eq-eq">operator==</a></b>(const TestQDoc::Test &<i>lhs</i>, const TestQDoc::Test &<i>rhs</i>)</td></tr> -</table></div> -<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"> -<h2 id="details">Detailed Description</h2> -</div> -<!-- @@@Test --> -<div class="types"> -<h2>Member Type Documentation</h2> -<!-- $$$SomeType --> -<h3 class="fn" id="SomeType-typedef">Test::<span class="name">SomeType</span></h3> -<p>A typedef.</p> -<!-- @@@SomeType --> -<!-- $$$Specialized --> -<h3 class="fn" id="Specialized-typedef"><code>[alias] </code>template<typename T> Test::<span class="name">Specialized</span></h3> -<!-- @@@Specialized --> -</div> -<div class="func"> -<h2>Member Function Documentation</h2> -<!-- $$$ --> -<div class="fngroup"> -<h3 class="fn fngroupitem" id="overload"><code>[protected] </code><span class="type">void</span> Test::<span class="name">overload</span>()</h3><h3 class="fn fngroupitem" id="overload-1"><code>[protected, since Test 1.2] </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> -<!-- @@@ --> -<!-- $$$Test[overload1]$$$Test --> -<h3 class="fn" id="Test"><code>[default] </code>Test::<span class="name">Test</span>()</h3> -<p>Default constructor.</p> -<!-- @@@Test --> -<!-- $$$operator=[overload1]$$$operator=TestQDoc::Test&& --> -<h3 class="fn" id="operator-eq"><code>[default] </code><span class="type"><a href="testqdoc-test.html">TestQDoc::Test</a></span> &Test::<span class="name">operator=</span>(<span class="type"><a href="testqdoc-test.html">TestQDoc::Test</a></span> &&<i>other</i>)</h3> -<p>Move-assigns <i>other</i>.</p> -<!-- @@@operator= --> -<!-- $$$funcPtr[overload1]$$$funcPtrboolconstchar* --> -<h3 class="fn" id="funcPtr"><span class="type">void</span> (*)(<span class="type">bool</span>) Test::<span class="name">funcPtr</span>(<span class="type">bool</span> <i>b</i>, const <span class="type">char</span> *<i>s</i>)</h3> -<p>Returns a pointer to a function that takes a boolean. Uses <i>b</i> and <i>s</i>.</p> -<!-- @@@funcPtr --> -<!-- $$$funcTemplate[overload1]$$$funcTemplateT1T2 --> -<h3 class="fn" id="funcTemplate"><code>[protected] </code>template <typename T1, typename T2> <span class="type">void</span> Test::<span class="name">funcTemplate</span>(<span class="type">T1</span> <i>a</i>, <span class="type">T2</span> <i>b</i>)</h3> -<p>Function template with two parameters, <i>a</i> and <i>b</i>.</p> -<!-- @@@funcTemplate --> -<!-- $$$inlineFunction[overload1]$$$inlineFunction --> -<h3 class="fn" id="inlineFunction"><span class="type">void</span> Test::<span class="name">inlineFunction</span>()</h3> -<p>An inline function, documented using the \fn QDoc command.</p> -<!-- @@@inlineFunction --> -<!-- $$$someFunction[overload1]$$$someFunctionintint --> -<h3 class="fn" id="someFunction"><span class="type">int</span> Test::<span class="name">someFunction</span>(<span class="type">int</span>, <span class="type">int</span> <i>v</i> = 0)</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"><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 --> -<!-- $$$virtualFun[overload1]$$$virtualFun --> -<h3 class="fn" id="virtualFun"><code>[virtual] </code><span class="type">void</span> Test::<span class="name">virtualFun</span>()</h3> -<p>Function that must be reimplemented.</p> -<!-- @@@virtualFun --> -</div> -<div class="relnonmem"> -<h2>Related Non-Members</h2> -<!-- $$$operator==[overload1]$$$operator==constTestQDoc::Test&constTestQDoc::Test& --> -<h3 class="fn" id="operator-eq-eq"><span class="type">bool</span> <span class="name">operator==</span>(const <span class="type"><a href="testqdoc-test.html">TestQDoc::Test</a></span> &<i>lhs</i>, const <span class="type"><a href="testqdoc-test.html">TestQDoc::Test</a></span> &<i>rhs</i>)</h3> -<p>Returns true if <i>lhs</i> and <i>rhs</i> are equal.</p> -<!-- @@@operator== --> -</div> -<div class="macros"> -<h2>Macro Documentation</h2> -<!-- $$$QDOCTEST_MACRO2[overload1]$$$QDOCTEST_MACRO2int& --> -<h3 class="fn" id="QDOCTEST_MACRO2"><code>[since Test 1.1] </code><span class="name">QDOCTEST_MACRO2</span>(<span class="type">int</span> &<i>x</i>)</h3> -<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 deleted file mode 100644 index fc0003335..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-vec.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testcpp.cpp --> - <title>Vec Class | TestCPP</title> -</head> -<body> -<li>Vec</li> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Vec Class</h1> -<span class="small-subtitle">template <typename T> class <a href="testqdoc.html">TestQDoc</a>::Vec</span> -<!-- $$$Vec-brief --> -<p>Type alias that has its own reference. <a href="#details">More...</a></p> -<!-- @@@Vec --> -<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> -<!-- $$$Vec-description --> -<div class="descr"> -<h2 id="details">Detailed Description</h2> -</div> -<!-- @@@Vec --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/test-cmaketest-example.html b/tests/auto/qdoc/generatedoutput/expected_output/test-cmaketest-example.html deleted file mode 100644 index e46acb6e5..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/test-cmaketest-example.html +++ /dev/null @@ -1,21 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- cmaketest.qdoc --> - <title>CMake Example Project | Test</title> -</head> -<body> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">CMake Example Project</h1> -<!-- $$$cmaketest-description --> -<div class="descr" id="details"> -<p class="centerAlign"><img src="images/leonardo-da-vinci.png" alt="" /></p><p>Files:</p> -<ul> -<li><a href="test-cmaketest-cmakelists-txt.html">cmaketest/CMakeLists.txt</a></li> -<li><a href="test-cmaketest-main-cpp.html">cmaketest/main.cpp</a></li> -</ul> -</div> -<!-- @@@cmaketest --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html b/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html deleted file mode 100644 index b89ce8ccb..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html +++ /dev/null @@ -1,54 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- examples.qdoc --> - <title>QML Documentation Example | Test</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#qml-class">QML Class</a></li> -<li class="level1"><a href="#properties-signals-handlers-and-methods">Properties, Signals, Handlers, and Methods</a></li> -<li class="level2"><a href="#internal-documentation">Internal Documentation</a></li> -<li class="level1"><a href="#qml-types-with-c-implementation">QML Types with C++ Implementation</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">QML Documentation Example</h1> -<!-- $$$componentset-brief --> -<p>Example for documenting QML types.</p> -<!-- @@@componentset --> -<!-- $$$componentset-description --> -<div class="descr" id="details"> -<p>This example demonstrates one of the ways to document QML types. It also generates a warning about a missing example image, on purpose.</p> -<p>In particular, there are sample types that are documented with QDoc commands comments. There are documentation comments for the QML types and their public interfaces. The types are grouped into a module, the <a href="uicomponents-qmlmodule.html">UI Components</a> module.</p> -<p>The uicomponents.qdoc file generates the overview page for the <a href="uicomponents-qmlmodule.html">UI Components</a> module page.</p> -<p>The generated documentation is available in the <a href="uicomponents-qmlmodule.html">UI Components</a> module.</p> -<h4 id="qml-class">QML Class</h4> -<p>The QML types use the \qmltype to document the type. In addition, they have the \inmodule command in order for QDoc to associate them to the <code>UIComponents</code> module.</p> -<p>QDoc uses the \brief command to place a basic description when listing the types.</p> -<h4 id="properties-signals-handlers-and-methods">Properties, Signals, Handlers, and Methods</h4> -<p>The types have their properties, signals, handlers, and methods defined in their respective QML files. QDoc associates the properties and methods to the types, therefore, you only need to place the documentation above the property, method, or signal.</p> -<p>To document the type of a <i>property alias</i>, you must use the \qmlproperty command to specify the data type.</p> -<pre class="cpp">\qmlproperty <span class="type">int</span> anAliasedProperty -An aliased property of type <span class="type">int</span><span class="operator">.</span></pre> -<h5 id="internal-documentation">Internal Documentation</h5> -<p>You may declare that a documentation is for internal use by placing the \internal command after the beginning QDoc comment <code>/*</code>. QDoc will prevent the internal documentation from appearing in the public API.</p> -<p>If you wish to omit certain parts of the documentation, you may use the \omit and \endomit command.</p> -<h4 id="qml-types-with-c-implementation">QML Types with C++ Implementation</h4> -<p>This example only demonstrates the documentation for types in QML files, but the regular QML commands may be placed inside C++ classes to define the public API of the QML type.</p> -<p>Files:</p> -<ul> -<li><a href="test-componentset-progressbar-qml.html">componentset/ProgressBar.qml</a></li> -<li><a href="test-componentset-switch-qml.html">componentset/Switch.qml</a></li> -<li><a href="test-componentset-tabwidget-qml.html">componentset/TabWidget.qml</a></li> -<li><a href="test-componentset-componentset-pro.html">componentset/componentset.pro</a></li> -<li><a href="test-componentset-componentset-qml.html">componentset/componentset.qml</a></li> -</ul> -</div> -<!-- @@@componentset --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/test-nover-qmlmodule.html b/tests/auto/qdoc/generatedoutput/expected_output/test-nover-qmlmodule.html deleted file mode 100644 index 0bb01efdf..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/test-nover-qmlmodule.html +++ /dev/null @@ -1,20 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- type.cpp --> - <title>Versionless QML Module | Test</title> -</head> -<body> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Versionless QML Module</h1> -<p>This module was introduced in Qt 1.1.</p> -<!-- $$$Test.NoVer-description --> -<div class="descr" id="details"> -</div> -<!-- @@@Test.NoVer --> -<div class="table"><table class="annotated"> -<tr class="odd topAlign"><td class="tblName"><p><a href="qml-test-nover-typenoversion.html">TypeNoVersion</a></p></td><td class="tblDescr"><p>Another QML type documented in a .cpp file</p></td></tr> -</table></div> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/test.qhp b/tests/auto/qdoc/generatedoutput/expected_output/test.qhp deleted file mode 100644 index b1b1670cd..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/test.qhp +++ /dev/null @@ -1,208 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<QtHelpProject version="1.0"> - <namespace>org.qt-project.test.001</namespace> - <virtualFolder>test</virtualFolder> - <metaData name="version" value="0.0.1"/> - <filterSection> - <toc> - <section ref="uicomponents-qmlmodule.html" title="UI Components"> - <section ref="uicomponents-qmlmodule.html" title="Test"> - <section ref="autolinking.html" title="Autolinking"/> - <section ref="test-cmaketest-example.html" title="CMake Example Project"/> - <section ref="test-demos-demo-example.html" title="Demo"/> - <section ref="test-demos-hidden-example.html" title="Hidden Demo"/> - <section ref="test-empty-qmlmodule.html" title="No QML Types Here"/> - <section ref="obsolete-classes.html" title="Obsolete Classes"/> - <section ref="testcpp-module.html" title="QDoc Test C++ Classes"/> - <section ref="qdoc-test-qmlmodule.html" title="QDoc.Test QML Module"/> - <section ref="test-componentset-example.html" title="QML Documentation Example"/> - <section ref="qmlmodules.html" title="QML Modules"/> - <section ref="uicomponents-qmlmodule.html" title="UI Components"/> - <section ref="test-nover-qmlmodule.html" title="Versionless QML Module"/> - </section> - <section ref="testcpp-module.html" title="Classes"> - <section ref="crossmoduleref.html" title="CrossModuleRef"/> - <section ref="testqdoc.html" title="TestQDoc"/> - <section ref="testqdoc-test.html" title="TestQDoc::Test Class Reference"> - <section ref="testqdoc-test-members.html" title="List of all members"/> - <section ref="testqdoc-test-obsolete.html" title="Obsolete members"/> - </section> - <section ref="testqdoc-testderived.html" title="TestQDoc::TestDerived Class Reference"> - <section ref="testqdoc-testderived-members.html" title="List of all members"/> - <section ref="testqdoc-testderived-obsolete.html" title="Obsolete members"/> - </section> - </section> - <section ref="uicomponents-qmlmodule.html" title="QML Types"> - <section ref="qml-qdoc-test-abstractparent.html" title="AbstractParent Type Reference"> - <section ref="qml-qdoc-test-abstractparent-members.html" title="List of all members"/> - </section> - <section ref="qml-qdoc-test-child.html" title="Child Type Reference"> - <section ref="qml-qdoc-test-child-members.html" title="List of all members"/> - </section> - <section ref="qml-qdoc-test-doctest.html" title="DocTest Type Reference"> - <section ref="qml-qdoc-test-doctest-members.html" title="List of all members"/> - </section> - <section ref="qml-qdoc-test-type.html" title="Type Type Reference"> - <section ref="qml-qdoc-test-type-members.html" title="List of all members"/> - <section ref="qml-qdoc-test-type-obsolete.html" title="Obsolete members"/> - </section> - <section ref="qml-qdoc-test-yetanotherchild.html" title="YetAnotherChild Type Reference"> - <section ref="qml-qdoc-test-yetanotherchild-members.html" title="List of all members"/> - </section> - <section ref="qml-uicomponents-progressbar.html" title="ProgressBar Type Reference"> - <section ref="qml-uicomponents-progressbar-members.html" title="List of all members"/> - </section> - <section ref="qml-uicomponents-switch.html" title="Switch Type Reference"> - <section ref="qml-uicomponents-switch-members.html" title="List of all members"/> - </section> - <section ref="qml-uicomponents-tabwidget.html" title="TabWidget Type Reference"> - <section ref="qml-uicomponents-tabwidget-members.html" title="List of all members"/> - </section> - <section ref="qml-int.html" title="int Type Reference"/> - </section> - </section> - </toc> - <keywords> - <keyword name="AbstractParent" id="QML.AbstractParent" ref="qml-qdoc-test-abstractparent.html"/> - <keyword name="AbstractParent" id="QML.QDoc.Test1.AbstractParent" ref="qml-qdoc-test-abstractparent.html"/> - <keyword name="Autolinking" id="Autolinking" ref="autolinking.html"/> - <keyword name="Child" id="QML.Child" ref="qml-qdoc-test-child.html"/> - <keyword name="Child" id="QML.QDoc.Test1.Child" ref="qml-qdoc-test-child.html"/> - <keyword name="CrossModuleRef" id="CrossModuleRef" ref="crossmoduleref.html"/> - <keyword name="DocTest" id="QML.DocTest" ref="qml-qdoc-test-doctest.html"/> - <keyword name="DocTest" id="QML.QDoc.Test1.DocTest" ref="qml-qdoc-test-doctest.html"/> - <keyword name="No QML Types Here" id="No QML Types Here" ref="test-empty-qmlmodule.html"/> - <keyword name="Obsolete Classes" id="Obsolete Classes" ref="obsolete-classes.html"/> - <keyword name="ProgressBar" id="QML.ProgressBar" ref="qml-uicomponents-progressbar.html"/> - <keyword name="ProgressBar" id="QML.UIComponents1.ProgressBar" ref="qml-uicomponents-progressbar.html"/> - <keyword name="QDOCTEST_MACRO" id="QDOCTEST_MACRO" ref="testqdoc.html#QDOCTEST_MACRO"/> - <keyword name="QDOCTEST_MACRO2" id="QDOCTEST_MACRO2" ref="testqdoc-test.html#QDOCTEST_MACRO2"/> - <keyword name="QDoc Test C++ Classes" id="QDoc Test C++ Classes" ref="testcpp-module.html"/> - <keyword name="QDoc.Test QML Module" id="QDoc.Test QML Module" ref="qdoc-test-qmlmodule.html"/> - <keyword name="QML Modules" id="QML Modules" ref="qmlmodules.html"/> - <keyword name="Switch" id="QML.Switch" ref="qml-uicomponents-switch.html"/> - <keyword name="Switch" id="QML.UIComponents1.Switch" ref="qml-uicomponents-switch.html"/> - <keyword name="TabWidget" id="QML.TabWidget" ref="qml-uicomponents-tabwidget.html"/> - <keyword name="TabWidget" id="QML.UIComponents1.TabWidget" ref="qml-uicomponents-tabwidget.html"/> - <keyword name="Test" id="TestQDoc::Test" ref="testqdoc-test.html"/> - <keyword name="Test::SomeType" id="Test::SomeType" ref="testqdoc-test.html#SomeType-typedef"/> - <keyword name="TestDerived" id="TestQDoc::TestDerived" ref="testqdoc-testderived.html"/> - <keyword name="TestDerived::DerivedType" id="TestDerived::DerivedType" ref="testqdoc-testderived.html#DerivedType-typedef"/> - <keyword name="TestDerived::NotTypedef" id="TestDerived::NotTypedef" ref="testqdoc-testderived.html#NotTypedef-typedef"/> - <keyword name="TestQDoc" id="TestQDoc" ref="testqdoc.html"/> - <keyword name="Type" id="QML.Type" ref="qml-qdoc-test-type.html"/> - <keyword name="Type" id="QML.QDoc.Test1.Type" ref="qml-qdoc-test-type.html"/> - <keyword name="TypeNoVersion" id="QML.TypeNoVersion" ref="qml-test-nover-typenoversion.html"/> - <keyword name="TypeNoVersion" id="QML.Test.NoVer.TypeNoVersion" ref="qml-test-nover-typenoversion.html"/> - <keyword name="UI Components" id="UI Components" ref="uicomponents-qmlmodule.html"/> - <keyword name="Versionless QML Module" id="Versionless QML Module" ref="test-nover-qmlmodule.html"/> - <keyword name="YetAnotherChild" id="QML.YetAnotherChild" ref="qml-qdoc-test-yetanotherchild.html"/> - <keyword name="YetAnotherChild" id="QML.QDoc.Test1.YetAnotherChild" ref="qml-qdoc-test-yetanotherchild.html"/> - <keyword name="abs" id="int::abs" ref="qml-int.html#abs-method"/> - <keyword name="active" id="DocTest::active" ref="qml-qdoc-test-doctest.html#active-prop"/> - <keyword name="anotherObsoleteMember" id="Test::anotherObsoleteMember" ref="testqdoc-test-obsolete.html#anotherObsoleteMember"/> - <keyword name="children" id="AbstractParent::children" ref="qml-qdoc-test-abstractparent.html#children-prop"/> - <keyword name="color" id="ProgressBar::color" ref="qml-uicomponents-progressbar.html#color-prop"/> - <keyword name="completed" id="DocTest::completed" ref="qml-qdoc-test-doctest.html#completed-signal"/> - <keyword name="completed" id="Type::completed" ref="qml-qdoc-test-type.html#completed-signal"/> - <keyword name="configured" id="Type::configured" ref="qml-qdoc-test-type.html#configured-signal"/> - <keyword name="copy" id="Type::copy" ref="qml-qdoc-test-type.html#copy-method"/> - <keyword name="current" id="TabWidget::current" ref="qml-uicomponents-tabwidget.html#current-prop"/> - <keyword name="deprecatedMember" id="Test::deprecatedMember" ref="testqdoc-test-obsolete.html#deprecatedMember"/> - <keyword name="deprecatedMethod" id="Type::deprecatedMethod" ref="qml-qdoc-test-type-obsolete.html#deprecatedMethod-method"/> - <keyword name="disable" id="Type::disable" ref="qml-qdoc-test-type.html#disable-method"/> - <keyword name="documentMe" id="CrossModuleRef::documentMe" ref="crossmoduleref.html#documentMe"/> - <keyword name="enable" id="Type::enable" ref="qml-qdoc-test-type.html#enable-method"/> - <keyword name="fail" id="DocTest::fail" ref="qml-qdoc-test-doctest.html#fail-method"/> - <keyword name="fail_hard" id="DocTest::fail_hard" ref="qml-qdoc-test-doctest.html#fail_hard-method"/> - <keyword name="fifth" id="Type::fifth" ref="qml-qdoc-test-type.html#fifth-prop"/> - <keyword name="foo" id="DocTest::foo" ref="qml-qdoc-test-doctest.html#foo-signal"/> - <keyword name="fourth" id="Type::fourth" ref="qml-qdoc-test-type.html#fourth-prop"/> - <keyword name="funcPtr" id="Test::funcPtr" ref="testqdoc-test.html#funcPtr"/> - <keyword name="group.created" id="Type::group.created" ref="qml-qdoc-test-type.html#group.created-signal"/> - <keyword name="group.first" id="Type::group.first" ref="qml-qdoc-test-type.html#group.first-prop"/> - <keyword name="group.second" id="Type::group.second" ref="qml-qdoc-test-type.html#group.second-prop"/> - <keyword name="group.third" id="Type::group.third" ref="qml-qdoc-test-type.html#group.third-prop"/> - <keyword name="id" id="Type::id" ref="qml-qdoc-test-type.html#id-prop"/> - <keyword name="inlineFunction" id="Test::inlineFunction" ref="testqdoc-test.html#inlineFunction"/> - <keyword name="int" id="QML.int" ref="qml-int.html"/> - <keyword name="itsHappening" id="DocTest::itsHappening" ref="qml-qdoc-test-doctest.html#itsHappening-signal"/> - <keyword name="maximum" id="ProgressBar::maximum" ref="qml-uicomponents-progressbar.html#maximum-prop"/> - <keyword name="minimum" id="ProgressBar::minimum" ref="qml-uicomponents-progressbar.html#minimum-prop"/> - <keyword name="name" id="AbstractParent::name" ref="qml-qdoc-test-abstractparent.html#name-method"/> - <keyword name="name" id="AbstractParent::name" ref="qml-qdoc-test-abstractparent.html#name-prop"/> - <keyword name="name" id="Child::name" ref="qml-qdoc-test-child.html#name-method"/> - <keyword name="name" id="Child::name" ref="qml-qdoc-test-child.html#name-prop"/> - <keyword name="name" id="DocTest::name" ref="qml-qdoc-test-doctest.html#name-prop"/> - <keyword name="name" id="Type::name" ref="qml-qdoc-test-type.html#name-prop"/> - <keyword name="obsoleteMember" id="Test::obsoleteMember" ref="testqdoc-test-obsolete.html#obsoleteMember"/> - <keyword name="on" id="Switch::on" ref="qml-uicomponents-switch.html#on-prop"/> - <keyword name="operator++" id="Test::operator++" ref="testqdoc-test-obsolete.html#operator-2b-2b"/> - <keyword name="operator--" id="Test::operator--" ref="testqdoc-test-obsolete.html#operator--"/> - <keyword name="operator=" id="Test::operator=" ref="testqdoc-test.html#operator-eq"/> - <keyword name="operator==" id="operator==" ref="testqdoc-test.html#operator-eq-eq"/> - <keyword name="overload" id="Test::overload" ref="testqdoc-test.html#overload"/> - <keyword name="rear" id="AbstractParent::rear" ref="qml-qdoc-test-abstractparent.html#rear-method"/> - <keyword name="sampleReadOnlyProperty" id="TabWidget::sampleReadOnlyProperty" ref="qml-uicomponents-tabwidget.html#sampleReadOnlyProperty-prop"/> - <keyword name="secondColor" id="ProgressBar::secondColor" ref="qml-uicomponents-progressbar.html#secondColor-prop"/> - <keyword name="someFunction" id="Test::someFunction" ref="testqdoc-test.html#someFunction"/> - <keyword name="someFunctionDefaultArg" id="Test::someFunctionDefaultArg" ref="testqdoc-test.html#someFunctionDefaultArg"/> - <keyword name="staticObsoleteMember" id="TestDerived::staticObsoleteMember" ref="testqdoc-testderived-obsolete.html#staticObsoleteMember"/> - <keyword name="toggle" id="Switch::toggle" ref="qml-uicomponents-switch.html#toggle-method"/> - <keyword name="type" id="Type::type" ref="qml-qdoc-test-type.html#type-attached-prop"/> - <keyword name="value" id="ProgressBar::value" ref="qml-uicomponents-progressbar.html#value-prop"/> - <keyword name="virtualFun" id="Test::virtualFun" ref="testqdoc-test.html#virtualFun"/> - <keyword name="virtualFun" id="TestDerived::virtualFun" ref="testqdoc-testderived.html#virtualFun"/> - </keywords> - <files> - <file>autolinking.html</file> - <file>crossmoduleref.html</file> - <file>images/leonardo-da-vinci.png</file> - <file>obsolete-classes.html</file> - <file>qdoc-test-qmlmodule.html</file> - <file>qml-int.html</file> - <file>qml-qdoc-test-abstractparent-members.html</file> - <file>qml-qdoc-test-abstractparent.html</file> - <file>qml-qdoc-test-child-members.html</file> - <file>qml-qdoc-test-child.html</file> - <file>qml-qdoc-test-doctest-members.html</file> - <file>qml-qdoc-test-doctest.html</file> - <file>qml-qdoc-test-type-members.html</file> - <file>qml-qdoc-test-type-obsolete.html</file> - <file>qml-qdoc-test-type.html</file> - <file>qml-qdoc-test-yetanotherchild-members.html</file> - <file>qml-qdoc-test-yetanotherchild.html</file> - <file>qml-test-nover-typenoversion-members.html</file> - <file>qml-test-nover-typenoversion.html</file> - <file>qml-uicomponents-progressbar-members.html</file> - <file>qml-uicomponents-progressbar.html</file> - <file>qml-uicomponents-switch-members.html</file> - <file>qml-uicomponents-switch.html</file> - <file>qml-uicomponents-tabwidget-members.html</file> - <file>qml-uicomponents-tabwidget.html</file> - <file>qmlmodules.html</file> - <file>test-cmaketest-cmakelists-txt.html</file> - <file>test-cmaketest-example.html</file> - <file>test-cmaketest-main-cpp.html</file> - <file>test-componentset-componentset-pro.html</file> - <file>test-componentset-componentset-qml.html</file> - <file>test-componentset-example.html</file> - <file>test-componentset-progressbar-qml.html</file> - <file>test-componentset-switch-qml.html</file> - <file>test-componentset-tabwidget-qml.html</file> - <file>test-demos-demo-example.html</file> - <file>test-demos-hidden-example.html</file> - <file>test-empty-qmlmodule.html</file> - <file>test-nover-qmlmodule.html</file> - <file>testcpp-module.html</file> - <file>testqdoc-test-members.html</file> - <file>testqdoc-test-obsolete.html</file> - <file>testqdoc-test.html</file> - <file>testqdoc-testderived-members.html</file> - <file>testqdoc-testderived-obsolete.html</file> - <file>testqdoc-testderived.html</file> - <file>testqdoc.html</file> - <file>uicomponents-qmlmodule.html</file> - </files> - </filterSection> -</QtHelpProject> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html b/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html deleted file mode 100644 index 04bd8e487..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html +++ /dev/null @@ -1,42 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testcpp.cpp --> - <title>QDoc Test C++ Classes | TestCPP</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#namespaces">Namespaces</a></li> -<li class="level1"><a href="#classes">Classes</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">QDoc Test C++ Classes</h1> -<!-- $$$TestCPP-brief --> -<p>A test module page. <a href="#details">More...</a></p> -<!-- @@@TestCPP --> -<h2 id="namespaces">Namespaces</h2> -<div class="table"><table class="annotated"> -<tr class="odd topAlign"><td class="tblName"><p><a href="crossmoduleref.html">CrossModuleRef</a></p></td><td class="tblDescr"><p>Namespace that has documented functions in multiple modules</p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="testqdoc.html">TestQDoc</a></p></td><td class="tblDescr"><p>A namespace</p></td></tr> -</table></div> -<h2 id="classes">Classes</h2> -<div class="table"><table class="annotated"> -<tr class="odd topAlign"><td class="tblName"><p><a href="testqdoc-test.html">TestQDoc::Test</a></p></td><td class="tblDescr"><p>A class in a namespace</p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p></td><td class="tblDescr"><p>A derived class in a namespace</p></td></tr> -</table></div> -<!-- $$$TestCPP-description --> -<div class="descr"> -<h2 id="details">Detailed Description</h2> -<div class="admonition note"> -<p><b>Note: </b>This is just a test.</p> -</div> -</div> -<!-- @@@TestCPP --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testcpp.index b/tests/auto/qdoc/generatedoutput/expected_output/testcpp.index deleted file mode 100644 index 34d36dd89..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/testcpp.index +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE QDOCINDEX> -<INDEX url="" title="TestCPP Reference Documentation" version="" project="TestCPP"> - <namespace name="" status="active" access="public" module="testcpp"> - <function name="QDOCTEST_MACRO" href="testqdoc.html#QDOCTEST_MACRO" status="active" access="public" documented="true" related="0" meta="macrowithoutparams" virtual="non" const="false" static="false" final="false" override="false" type="" signature="QDOCTEST_MACRO"/> - <function name="QDOCTEST_MACRO2" href="testqdoc-test.html#QDOCTEST_MACRO2" status="active" access="public" documented="true" related="1" since="Test 1.1" meta="macrowithparams" virtual="non" const="false" static="false" final="false" override="false" type="" brief="A macro with argument x" signature="QDOCTEST_MACRO2(int &x)" groups="testgroup"> - <parameter type="int &" name="x" default=""/> - </function> - <page name="autolinking.html" href="autolinking.html" status="active" location="classlists.qdoc" documented="true" subtype="page" title="Autolinking" fulltitle="Autolinking" subtitle=""> - <contents name="testqdoc" title="TestQDoc" level="1"/> - </page> - <namespace name="CrossModuleRef" href="crossmoduleref.html" status="active" access="public" location="testcpp.h" documented="true" module="TestCPP" brief="Namespace that has documented functions in multiple modules"> - <function name="documentMe" fullname="CrossModuleRef::documentMe" href="crossmoduleref.html#documentMe" status="active" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" signature="void documentMe()"/> - </namespace> - <class name="DontLinkToMe" href="dontlinktome.html" status="ignored" access="public" location="testcpp.h" documented="true" module="TestCPP" brief="Class that does not generate documentation"/> - <page name="obsolete-classes.html" href="obsolete-classes.html" status="active" location="classlists.qdoc" documented="true" subtype="page" title="Obsolete Classes" fulltitle="Obsolete Classes" subtitle=""> - <contents name="classes-with-obsolete-members" title="Classes with obsolete members" level="1"/> - <contents name="testqdoc" title="TestQDoc" level="2"/> - </page> - <namespace name="TestQDoc" href="testqdoc.html" status="active" access="public" location="testcpp.h" documented="true" module="TestCPP" brief="A namespace"> - <contents name="usage" title="Usage" level="1"/> - <function name="QDOCTEST_MACRO" href="testqdoc.html#QDOCTEST_MACRO" status="active" access="public" documented="true" related="0" meta="macrowithoutparams" virtual="non" const="false" static="false" final="false" override="false" type="" signature="QDOCTEST_MACRO"/> - <class name="Test" fullname="TestQDoc::Test" href="testqdoc-test.html" status="active" access="public" location="testcpp.h" documented="true" groups="testgroup" module="TestCPP" brief="A class in a namespace"> - <function name="QDOCTEST_MACRO2" href="testqdoc-test.html#QDOCTEST_MACRO2" status="active" access="public" documented="true" related="1" since="Test 1.1" meta="macrowithparams" virtual="non" const="false" static="false" final="false" override="false" type="" brief="A macro with argument x" signature="QDOCTEST_MACRO2(int &x)" groups="testgroup"> - <parameter type="int &" name="x" default=""/> - </function> - <function name="Test" fullname="TestQDoc::Test::Test" href="testqdoc-test.html#Test" status="active" access="public" documented="true" meta="constructor" virtual="non" const="false" static="false" final="false" override="false" type="" signature="Test()"/> - <function name="anotherObsoleteMember" fullname="TestQDoc::Test::anotherObsoleteMember" href="testqdoc-test-obsolete.html#anotherObsoleteMember" status="deprecated" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" signature="void anotherObsoleteMember()"/> - <function name="deprecatedMember" fullname="TestQDoc::Test::deprecatedMember" href="testqdoc-test-obsolete.html#deprecatedMember" status="deprecated" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" signature="void deprecatedMember()"/> - <function name="funcPtr" fullname="TestQDoc::Test::funcPtr" href="testqdoc-test.html#funcPtr" status="active" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void (*)(bool)" signature="void (*)(bool) funcPtr(bool b, const char *s)"> - <parameter type="bool" name="b" default=""/> - <parameter type="const char *" name="s" default=""/> - </function> - <function name="inlineFunction" fullname="TestQDoc::Test::inlineFunction" href="testqdoc-test.html#inlineFunction" status="active" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" brief="An inline function, documented using the \fn QDoc command" signature="void inlineFunction()"/> - <function name="obsoleteMember" fullname="TestQDoc::Test::obsoleteMember" href="testqdoc-test-obsolete.html#obsoleteMember" status="deprecated" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" signature="void obsoleteMember()"/> - <function name="operator++" fullname="TestQDoc::Test::operator++" href="testqdoc-test-obsolete.html#operator-2b-2b" status="deprecated" access="public" location="testcpp.h" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="TestQDoc::Test &" signature="TestQDoc::Test & operator++()"/> - <function name="operator--" fullname="TestQDoc::Test::operator--" href="testqdoc-test-obsolete.html#operator--" status="deprecated" access="public" location="testcpp.h" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="TestQDoc::Test &" signature="TestQDoc::Test & operator--()"/> - <function name="operator=" fullname="TestQDoc::Test::operator=" href="testqdoc-test.html#operator-eq" status="active" access="public" documented="true" meta="move-assign" virtual="non" const="false" static="false" final="false" override="false" type="TestQDoc::Test &" signature="TestQDoc::Test & operator=(TestQDoc::Test &&other)"> - <parameter type="TestQDoc::Test &&" name="other" default=""/> - </function> - <function name="operator==" href="testqdoc-test.html#operator-eq-eq" status="active" access="public" location="testcpp.h" documented="true" related="2" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="bool" signature="bool operator==(const TestQDoc::Test &lhs, const TestQDoc::Test &rhs)"> - <parameter type="const TestQDoc::Test &" name="lhs" default=""/> - <parameter type="const TestQDoc::Test &" name="rhs" default=""/> - </function> - <function name="overload" fullname="TestQDoc::Test::overload" href="testqdoc-test.html#overload" status="active" access="protected" location="testcpp.h" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" signature="void overload()"/> - <function name="overload" fullname="TestQDoc::Test::overload" href="testqdoc-test.html#overload-1" status="active" access="protected" location="testcpp.h" documented="true" since="Test 1.2" meta="plain" virtual="non" const="false" static="false" final="false" override="false" overload="true" overload-number="1" type="void" signature="void overload(bool b)"> - <parameter type="bool" name="b" default=""/> - </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, int v)"> - <parameter type="int" name="" default=""/> - <parameter type="int" name="v" default="0"/> - </function> - <function name="someFunctionDefaultArg" fullname="TestQDoc::Test::someFunctionDefaultArg" href="testqdoc-test.html#someFunctionDefaultArg" status="active" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" signature="void someFunctionDefaultArg(int i, bool b)" groups="testgroup"> - <parameter type="int" name="i" default=""/> - <parameter type="bool" name="b" default="false"/> - </function> - <function name="virtualFun" fullname="TestQDoc::Test::virtualFun" href="testqdoc-test.html#virtualFun" status="active" access="public" location="testcpp.h" documented="true" meta="plain" virtual="virtual" const="false" static="false" final="false" override="false" type="void" signature="void virtualFun()"/> - <typedef name="SomeType" fullname="TestQDoc::Test::SomeType" href="testqdoc-test.html#SomeType-typedef" status="active" access="public" location="testcpp.h" documented="true"/> - </class> - <class name="TestDerived" fullname="TestQDoc::TestDerived" href="testqdoc-testderived.html" status="active" access="public" location="testcpp.h" documented="true" bases="TestQDoc::Test" module="TestCPP" brief="A derived class in a namespace"> - <function name="staticObsoleteMember" fullname="TestQDoc::TestDerived::staticObsoleteMember" href="testqdoc-testderived-obsolete.html#staticObsoleteMember" status="deprecated" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="true" final="false" override="false" type="void" signature="void staticObsoleteMember()"/> - <function name="virtualFun" fullname="TestQDoc::TestDerived::virtualFun" href="testqdoc-testderived.html#virtualFun" status="active" access="public" location="testcpp.h" documented="true" meta="plain" virtual="virtual" const="false" static="false" final="false" override="true" type="void" signature="void virtualFun() override"/> - <typedef name="DerivedType" fullname="TestQDoc::TestDerived::DerivedType" href="testqdoc-testderived.html#DerivedType-typedef" status="active" access="public" location="testcpp.h" documented="true" aliasedtype="Test::SomeType"/> - <typedef name="NotTypedef" fullname="TestQDoc::TestDerived::NotTypedef" href="testqdoc-testderived.html#NotTypedef-typedef" status="active" access="public" location="testcpp.h" documented="true" aliasedtype="int"/> - </class> - </namespace> - <group name="testgroup" href="testgroup.html" status="internal" seen="false" title=""/> - <module name="TestCPP" href="testcpp-module.html" status="active" documented="true" seen="true" title="QDoc Test C++ Classes" brief="A test module page"/> - </namespace> -</INDEX> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html deleted file mode 100644 index df0da4386..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html +++ /dev/null @@ -1,26 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testcpp.cpp --> - <title>List of All Members for Test | TestCPP</title> -</head> -<body> -<li>Test</li> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">List of All Members for Test</h1> -<p>This is the complete list of members for <a href="testqdoc-test.html">TestQDoc::Test</a>, including inherited members.</p> -<ul> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#SomeType-typedef">SomeType</a></b></span></li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#Test">Test</a></b></span>()</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#operator-eq">operator=</a></b></span>(TestQDoc::Test &&) : TestQDoc::Test &</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#funcPtr">funcPtr</a></b></span>(bool, const char *) : void (*)(bool)</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#inlineFunction">inlineFunction</a></b></span>()</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#overload">overload</a></b></span>()</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#overload-1">overload</a></b></span>(bool)</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#someFunction">someFunction</a></b></span>(int, int) : int</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#someFunctionDefaultArg">someFunctionDefaultArg</a></b></span>(int, bool)</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#virtualFun">virtualFun</a></b></span>()</li> -</ul> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-obsolete.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-obsolete.html deleted file mode 100644 index f2745c488..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-obsolete.html +++ /dev/null @@ -1,43 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testcpp.cpp --> - <title>Obsolete Members for Test | TestCPP</title> -</head> -<body> -<li>Test</li> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Obsolete Members for Test</h1> -<p><b>The following members of class <a href="testqdoc-test.html">Test</a> are deprecated.</b> They are provided to keep old source code working. We strongly advise against using them in new code.</p> -<h2>Public Functions</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft topAlign rightAlign"> <code>(deprecated) </code>void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test-obsolete.html#anotherObsoleteMember">anotherObsoleteMember</a></b>()</td></tr> -<tr><td class="memItemLeft topAlign rightAlign"> <code>(deprecated (6.0)) </code>void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test-obsolete.html#deprecatedMember">deprecatedMember</a></b>()</td></tr> -<tr><td class="memItemLeft topAlign rightAlign"> <code>(deprecated) </code>void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test-obsolete.html#obsoleteMember">obsoleteMember</a></b>()</td></tr> -<tr><td class="memItemLeft topAlign rightAlign"> <code>(deprecated) </code>TestQDoc::Test &</td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test-obsolete.html#operator-2b-2b">operator++</a></b>()</td></tr> -<tr><td class="memItemLeft topAlign rightAlign"> <code>(deprecated) </code>TestQDoc::Test &</td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test-obsolete.html#operator--">operator--</a></b>()</td></tr> -</table></div> -<h2>Member Function Documentation</h2> -<!-- $$$ --> -<div class="fngroup"> -<h3 class="fn fngroupitem" id="operator-2b-2b"><span class="type"><a href="testqdoc-test.html">TestQDoc::Test</a></span> &Test::<span class="name">operator++</span>()</h3><h3 class="fn fngroupitem" id="operator--"><span class="type"><a href="testqdoc-test.html">TestQDoc::Test</a></span> &Test::<span class="name">operator--</span>()</h3></div> -<p>This function is deprecated. We strongly advise against using it in new code.</p> -<!-- @@@ --> -<!-- $$$anotherObsoleteMember[overload1]$$$anotherObsoleteMember --> -<h3 class="fn" id="anotherObsoleteMember"><span class="type">void</span> Test::<span class="name">anotherObsoleteMember</span>()</h3> -<p>This function is deprecated. We strongly advise against using it in new code.</p> -<p>Use <a href="testqdoc-test-obsolete.html#obsoleteMember">obsoleteMember</a>() instead.</p> -<!-- @@@anotherObsoleteMember --> -<!-- $$$deprecatedMember[overload1]$$$deprecatedMember --> -<h3 class="fn" id="deprecatedMember"><span class="type">void</span> Test::<span class="name">deprecatedMember</span>()</h3> -<p>This function is deprecated since 6.0. We strongly advise against using it in new code.</p> -<p>Use <a href="testqdoc-test.html#someFunction">someFunction</a>() instead.</p> -<!-- @@@deprecatedMember --> -<!-- $$$obsoleteMember[overload1]$$$obsoleteMember --> -<h3 class="fn" id="obsoleteMember"><span class="type">void</span> Test::<span class="name">obsoleteMember</span>()</h3> -<p>This function is deprecated. We strongly advise against using it in new code.</p> -<p>Use <a href="testqdoc-test.html#someFunction">someFunction</a>() instead.</p> -<!-- @@@obsoleteMember --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html deleted file mode 100644 index a160f568f..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html +++ /dev/null @@ -1,128 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testcpp.cpp --> - <title>Test Class | TestCPP</title> -</head> -<body> -<li>Test</li> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#public-types">Public Types</a></li> -<li class="level1"><a href="#public-functions">Public Functions</a></li> -<li class="level1"><a href="#protected-functions">Protected Functions</a></li> -<li class="level1"><a href="#related-non-members">Related Non-Members</a></li> -<li class="level1"><a href="#macros">Macros</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Test Class</h1> -<span class="small-subtitle">class <a href="testqdoc.html">TestQDoc</a>::Test</span> -<!-- $$$Test-brief --> -<p>A class in a namespace. <a href="#details">More...</a></p> -<!-- @@@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><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> -<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> -<h2 id="public-types">Public Types</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#SomeType-typedef">SomeType</a></b></td></tr> -</table></div> -<h2 id="public-functions">Public Functions</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#Test">Test</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> TestQDoc::Test &</td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#operator-eq">operator=</a></b>(TestQDoc::Test &&<i>other</i>)</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void (*)(bool) </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#funcPtr">funcPtr</a></b>(bool <i>b</i>, const char *<i>s</i>)</td></tr> -<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, int <i>v</i> = 0)</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> -<tr><td class="memItemLeft rightAlign topAlign"> virtual void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#virtualFun">virtualFun</a></b>()</td></tr> -</table></div> -<h2 id="protected-functions">Protected 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#overload">overload</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#overload-1">overload</a></b>(bool <i>b</i>)</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"> bool </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#operator-eq-eq">operator==</a></b>(const TestQDoc::Test &<i>lhs</i>, const TestQDoc::Test &<i>rhs</i>)</td></tr> -</table></div> -<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> -</table></div> -<!-- $$$Test-description --> -<div class="descr"> -<h2 id="details">Detailed Description</h2> -</div> -<!-- @@@Test --> -<div class="types"> -<h2>Member Type Documentation</h2> -<!-- $$$SomeType --> -<h3 class="fn" id="SomeType-typedef">Test::<span class="name">SomeType</span></h3> -<p>A typedef.</p> -<!-- @@@SomeType --> -</div> -<div class="func"> -<h2>Member Function Documentation</h2> -<!-- $$$ --> -<div class="fngroup"> -<h3 class="fn fngroupitem" id="overload"><code>[protected] </code><span class="type">void</span> Test::<span class="name">overload</span>()</h3><h3 class="fn fngroupitem" id="overload-1"><code>[protected, since Test 1.2] </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> -<!-- @@@ --> -<!-- $$$Test[overload1]$$$Test --> -<h3 class="fn" id="Test"><code>[default] </code>Test::<span class="name">Test</span>()</h3> -<p>Default constructor.</p> -<!-- @@@Test --> -<!-- $$$operator=[overload1]$$$operator=TestQDoc::Test&& --> -<h3 class="fn" id="operator-eq"><code>[default] </code><span class="type"><a href="testqdoc-test.html">TestQDoc::Test</a></span> &Test::<span class="name">operator=</span>(<span class="type"><a href="testqdoc-test.html">TestQDoc::Test</a></span> &&<i>other</i>)</h3> -<p>Move-assigns <i>other</i>.</p> -<!-- @@@operator= --> -<!-- $$$funcPtr[overload1]$$$funcPtrboolconstchar* --> -<h3 class="fn" id="funcPtr"><span class="type">void</span> (*)(<span class="type">bool</span>) Test::<span class="name">funcPtr</span>(<span class="type">bool</span> <i>b</i>, const <span class="type">char</span> *<i>s</i>)</h3> -<p>Returns a pointer to a function that takes a boolean. Uses <i>b</i> and <i>s</i>.</p> -<!-- @@@funcPtr --> -<!-- $$$inlineFunction[overload1]$$$inlineFunction --> -<h3 class="fn" id="inlineFunction"><span class="type">void</span> Test::<span class="name">inlineFunction</span>()</h3> -<p>An inline function, documented using the \fn QDoc command.</p> -<!-- @@@inlineFunction --> -<!-- $$$someFunction[overload1]$$$someFunctionintint --> -<h3 class="fn" id="someFunction"><span class="type">int</span> Test::<span class="name">someFunction</span>(<span class="type">int</span>, <span class="type">int</span> <i>v</i> = 0)</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"><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 --> -<!-- $$$virtualFun[overload1]$$$virtualFun --> -<h3 class="fn" id="virtualFun"><code>[virtual] </code><span class="type">void</span> Test::<span class="name">virtualFun</span>()</h3> -<p>Function that must be reimplemented.</p> -<!-- @@@virtualFun --> -</div> -<div class="relnonmem"> -<h2>Related Non-Members</h2> -<!-- $$$operator==[overload1]$$$operator==constTestQDoc::Test&constTestQDoc::Test& --> -<h3 class="fn" id="operator-eq-eq"><span class="type">bool</span> <span class="name">operator==</span>(const <span class="type"><a href="testqdoc-test.html">TestQDoc::Test</a></span> &<i>lhs</i>, const <span class="type"><a href="testqdoc-test.html">TestQDoc::Test</a></span> &<i>rhs</i>)</h3> -<p>Returns true if <i>lhs</i> and <i>rhs</i> are equal.</p> -<!-- @@@operator== --> -</div> -<div class="macros"> -<h2>Macro Documentation</h2> -<!-- $$$QDOCTEST_MACRO2[overload1]$$$QDOCTEST_MACRO2int& --> -<h3 class="fn" id="QDOCTEST_MACRO2"><code>[since Test 1.1] </code><span class="name">QDOCTEST_MACRO2</span>(<span class="type">int</span> &<i>x</i>)</h3> -<p>A macro with argument <i>x</i>.</p> -<p>This function was introduced in Test 1.1.</p> -<!-- @@@QDOCTEST_MACRO2 --> -</div> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-members.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-members.html deleted file mode 100644 index f8f9cd8f7..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-members.html +++ /dev/null @@ -1,27 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testcpp.cpp --> - <title>List of All Members for TestDerived | TestCPP</title> -</head> -<body> -<li>TestDerived</li> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">List of All Members for TestDerived</h1> -<p>This is the complete list of members for <a href="testqdoc-testderived.html">TestQDoc::TestDerived</a>, including inherited members.</p> -<ul> -<li class="fn"><span class="name"><b><a href="testqdoc-testderived.html#DerivedType-typedef">DerivedType</a></b></span></li> -<li class="fn"><span class="name"><b><a href="testqdoc-testderived.html#NotTypedef-typedef">NotTypedef</a></b></span></li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#SomeType-typedef">SomeType</a></b></span></li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#operator-eq">operator=</a></b></span>(TestQDoc::Test &&) : TestQDoc::Test &</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#funcPtr">funcPtr</a></b></span>(bool, const char *) : void (*)(bool)</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#inlineFunction">inlineFunction</a></b></span>()</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#overload">overload</a></b></span>()</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#overload-1">overload</a></b></span>(bool)</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#someFunction">someFunction</a></b></span>(int, int) : int</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#someFunctionDefaultArg">someFunctionDefaultArg</a></b></span>(int, bool)</li> -<li class="fn"><span class="name"><b><a href="testqdoc-testderived.html#virtualFun">virtualFun</a></b></span>()</li> -</ul> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-obsolete.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-obsolete.html deleted file mode 100644 index ace00a295..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-obsolete.html +++ /dev/null @@ -1,24 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testcpp.cpp --> - <title>Obsolete Members for TestDerived | TestCPP</title> -</head> -<body> -<li>TestDerived</li> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Obsolete Members for TestDerived</h1> -<p><b>The following members of class <a href="testqdoc-testderived.html">TestDerived</a> are deprecated.</b> They are provided to keep old source code working. We strongly advise against using them in new code.</p> -<h2>Static Public Members</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft topAlign rightAlign"> <code>(deprecated) </code>void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived-obsolete.html#staticObsoleteMember">staticObsoleteMember</a></b>()</td></tr> -</table></div> -<h2>Member Function Documentation</h2> -<!-- $$$staticObsoleteMember[overload1]$$$staticObsoleteMember --> -<h3 class="fn" id="staticObsoleteMember"><code>[static] </code><span class="type">void</span> TestDerived::<span class="name">staticObsoleteMember</span>()</h3> -<p>This function is deprecated. We strongly advise against using it in new code.</p> -<p>Static obsolete method.</p> -<!-- @@@staticObsoleteMember --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html deleted file mode 100644 index 813e00f55..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html +++ /dev/null @@ -1,66 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testcpp.cpp --> - <title>TestDerived Class | TestCPP</title> -</head> -<body> -<li>TestDerived</li> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#public-types">Public Types</a></li> -<li class="level1"><a href="#reimplemented-public-functions">Reimplemented Public Functions</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">TestDerived Class</h1> -<span class="small-subtitle">class <a href="testqdoc.html">TestQDoc</a>::TestDerived</span> -<!-- $$$TestDerived-brief --> -<p>A derived class in a namespace. <a href="#details">More...</a></p> -<!-- @@@TestDerived --> -<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> -<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> -<h2 id="public-types">Public Types</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#DerivedType-typedef">DerivedType</a></b></td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#NotTypedef-typedef">NotTypedef</a></b></td></tr> -</table></div> -<h2 id="reimplemented-public-functions">Reimplemented Public Functions</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> virtual void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#virtualFun">virtualFun</a></b>() override</td></tr> -</table></div> -<!-- $$$TestDerived-description --> -<div class="descr"> -<h2 id="details">Detailed Description</h2> -</div> -<!-- @@@TestDerived --> -<div class="types"> -<h2>Member Type Documentation</h2> -<!-- $$$DerivedType --> -<h3 class="fn" id="DerivedType-typedef"><code>[alias] </code>TestDerived::<span class="name">DerivedType</span></h3> -<p>An aliased typedef.</p> -<!-- @@@DerivedType --> -<!-- $$$NotTypedef --> -<h3 class="fn" id="NotTypedef-typedef"><code>[alias] </code>TestDerived::<span class="name">NotTypedef</span></h3> -<p>I'm an alias, not a typedef.</p> -<!-- @@@NotTypedef --> -</div> -<div class="func"> -<h2>Member Function Documentation</h2> -<!-- $$$virtualFun[overload1]$$$virtualFun --> -<h3 class="fn" id="virtualFun"><code>[override virtual] </code><span class="type">void</span> TestDerived::<span class="name">virtualFun</span>()</h3> -<p>Reimplements: <a href="testqdoc-test.html#virtualFun">Test::virtualFun</a>().</p> -<!-- @@@virtualFun --> -</div> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html deleted file mode 100644 index 289712177..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html +++ /dev/null @@ -1,60 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testcpp.cpp --> - <title>TestQDoc Namespace | TestCPP</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#classes">Classes</a></li> -<li class="level1"><a href="#macros">Macros</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -<li class="level2"><a href="#usage">Usage</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">TestQDoc Namespace</h1> -<!-- $$$TestQDoc-brief --> -<p>A namespace. <a href="#details">More...</a></p> -<!-- @@@TestQDoc --> -<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> -<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> -<tr><td class="memItemLeft rightAlign topAlign"> class </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html">TestDerived</a></b></td></tr> -</table></div> -<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.html#QDOCTEST_MACRO">QDOCTEST_MACRO</a></b></td></tr> -</table></div> -<!-- $$$TestQDoc-description --> -<div class="descr"> -<h2 id="details">Detailed Description</h2> -<h3 id="usage">Usage</h3> -<p>This namespace is for testing QDoc output.</p> -</div> -<!-- @@@TestQDoc --> -<div class="classes"> -<h2>Classes</h2> -<h3> class <a href="testqdoc-test.html">Test</a></h3><!-- $$$Test-brief --> -<p>A class in a namespace. <a href="testqdoc-test.html#details">More...</a></p> -<!-- @@@Test --> -<h3> class <a href="testqdoc-testderived.html">TestDerived</a></h3><!-- $$$TestDerived-brief --> -<p>A derived class in a namespace. <a href="testqdoc-testderived.html#details">More...</a></p> -<!-- @@@TestDerived --> -</div> -<div class="macros"> -<h2>Macro Documentation</h2> -<!-- $$$QDOCTEST_MACRO[overload1]$$$QDOCTEST_MACRO --> -<h3 class="fn" id="QDOCTEST_MACRO"><span class="name">QDOCTEST_MACRO</span></h3> -<!-- @@@QDOCTEST_MACRO --> -</div> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testtagfile.tags b/tests/auto/qdoc/generatedoutput/expected_output/testtagfile.tags deleted file mode 100644 index 49ceccd6d..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/testtagfile.tags +++ /dev/null @@ -1,335 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<tagfile> - <compound kind="class"> - <name>QDoc.Test.AbstractParent</name> - <filename>qml-qdoc-test-abstractparent.html</filename> - <member kind="function" protection="public" virtualness="non" static="no"> - <type>void</type> - <name>rear</name> - <anchorfile>qml-qdoc-test-abstractparent.html</anchorfile> - <anchor>rear-method</anchor> - <arglist>(Child child, var method)</arglist> - </member> - <member kind="function" protection="public" virtualness="non" static="no"> - <type>void</type> - <name>name</name> - <anchorfile>qml-qdoc-test-abstractparent.html</anchorfile> - <anchor>name-method</anchor> - <arglist>(Child child, name)</arglist> - </member> - <member kind="function" protection="public" virtualness="non" static="no"> - <type>void</type> - <name>name</name> - <anchorfile>qml-qdoc-test-abstractparent.html</anchorfile> - <anchor>name-method</anchor> - <arglist>()</arglist> - </member> - </compound> - <compound kind="class"> - <name>QDoc.Test.Child</name> - <filename>qml-qdoc-test-child.html</filename> - <member kind="function" protection="public" virtualness="non" static="no"> - <type>void</type> - <name>name</name> - <anchorfile>qml-qdoc-test-child.html</anchorfile> - <anchor>name-method</anchor> - <arglist>(Child child, name)</arglist> - </member> - </compound> - <compound kind="namespace"> - <name>CrossModuleRef</name> - <filename>crossmoduleref.html</filename> - <member kind="function" protection="public" virtualness="non" static="no"> - <type>void</type> - <name>documentMe</name> - <anchorfile>crossmoduleref.html</anchorfile> - <anchor>documentMe</anchor> - <arglist>()</arglist> - </member> - </compound> - <compound kind="class"> - <name>QDoc.Test.DocTest</name> - <filename>qml-qdoc-test-doctest.html</filename> - <member kind="function" protection="public" virtualness="non" static="no"> - <type></type> - <name>completed</name> - <anchorfile>qml-qdoc-test-doctest.html</anchorfile> - <anchor>completed-signal</anchor> - <arglist>()</arglist> - </member> - <member kind="function" protection="public" virtualness="non" static="no"> - <type></type> - <name>foo</name> - <anchorfile>qml-qdoc-test-doctest.html</anchorfile> - <anchor>foo-signal</anchor> - <arglist>(var bar)</arglist> - </member> - <member kind="function" protection="public" virtualness="non" static="no"> - <type></type> - <name>itsHappening</name> - <anchorfile>qml-qdoc-test-doctest.html</anchorfile> - <anchor>itsHappening-signal</anchor> - <arglist>(bool really)</arglist> - </member> - <member kind="function" protection="public" virtualness="non" static="no"> - <type></type> - <name>fail</name> - <anchorfile>qml-qdoc-test-doctest.html</anchorfile> - <anchor>fail-method</anchor> - <arglist>(message)</arglist> - </member> - <member kind="function" protection="public" virtualness="non" static="no"> - <type></type> - <name>fail_hard</name> - <anchorfile>qml-qdoc-test-doctest.html</anchorfile> - <anchor>fail_hard-method</anchor> - <arglist>(msg, option)</arglist> - </member> - </compound> - <compound kind="class"> - <name>UIComponents.ProgressBar</name> - <filename>qml-uicomponents-progressbar.html</filename> - </compound> - <compound kind="class"> - <name>UIComponents.Switch</name> - <filename>qml-uicomponents-switch.html</filename> - <member kind="function" protection="public" virtualness="non" static="no"> - <type></type> - <name>toggle</name> - <anchorfile>qml-uicomponents-switch.html</anchorfile> - <anchor>toggle-method</anchor> - <arglist>()</arglist> - </member> - </compound> - <compound kind="class"> - <name>UIComponents.TabWidget</name> - <filename>qml-uicomponents-tabwidget.html</filename> - </compound> - <compound kind="namespace"> - <name>TestQDoc</name> - <filename>testqdoc.html</filename> - <class>TestQDoc::Test</class> - <class>TestQDoc::TestDerived</class> - <member kind="function" protection="public" virtualness="non" static="no"> - <type></type> - <name>QDOCTEST_MACRO</name> - <anchorfile>testqdoc.html</anchorfile> - <anchor>QDOCTEST_MACRO</anchor> - <arglist>QDOCTEST_MACRO</arglist> - </member> - </compound> - <compound kind="class"> - <name>TestQDoc::Test</name> - <filename>testqdoc-test.html</filename> - <member kind="typedef" type=""> - <name>SomeType</name> - <anchorfile>testqdoc-test.html</anchorfile> - <anchor>SomeType-typedef</anchor> - <arglist></arglist> - </member> - <member kind="function" protection="public" virtualness="non" static="no"> - <type>int</type> - <name>someFunction</name> - <anchorfile>testqdoc-test.html</anchorfile> - <anchor>someFunction</anchor> - <arglist>(int, int v)</arglist> - </member> - <member kind="function" protection="public" virtualness="non" static="no"> - <type>void</type> - <name>someFunctionDefaultArg</name> - <anchorfile>testqdoc-test.html</anchorfile> - <anchor>someFunctionDefaultArg</anchor> - <arglist>(int i, bool b)</arglist> - </member> - <member kind="function" protection="public" virtualness="non" static="no"> - <type>void</type> - <name>obsoleteMember</name> - <anchorfile>testqdoc-test-obsolete.html</anchorfile> - <anchor>obsoleteMember</anchor> - <arglist>()</arglist> - </member> - <member kind="function" protection="public" virtualness="non" static="no"> - <type>void</type> - <name>anotherObsoleteMember</name> - <anchorfile>testqdoc-test-obsolete.html</anchorfile> - <anchor>anotherObsoleteMember</anchor> - <arglist>()</arglist> - </member> - <member kind="function" protection="public" virtualness="non" static="no"> - <type>void</type> - <name>deprecatedMember</name> - <anchorfile>testqdoc-test-obsolete.html</anchorfile> - <anchor>deprecatedMember</anchor> - <arglist>()</arglist> - </member> - <member kind="function" protection="public" virtualness="non" static="no"> - <type>void (*)(bool)</type> - <name>funcPtr</name> - <anchorfile>testqdoc-test.html</anchorfile> - <anchor>funcPtr</anchor> - <arglist>(*)(bool) funcPtr(bool b, const char *s)</arglist> - </member> - <member kind="function" protection="public" virtualness="non" static="no"> - <type>TestQDoc::Test &</type> - <name>operator++</name> - <anchorfile>testqdoc-test-obsolete.html</anchorfile> - <anchor>operator-2b-2b</anchor> - <arglist>()</arglist> - </member> - <member kind="function" protection="public" virtualness="non" static="no"> - <type>TestQDoc::Test &</type> - <name>operator--</name> - <anchorfile>testqdoc-test-obsolete.html</anchorfile> - <anchor>operator--</anchor> - <arglist>()</arglist> - </member> - <member kind="function" protection="public" virtualness="non" static="no"> - <type>void</type> - <name>inlineFunction</name> - <anchorfile>testqdoc-test.html</anchorfile> - <anchor>inlineFunction</anchor> - <arglist>()</arglist> - </member> - <member kind="function" protection="public" virtualness="virtual" static="no"> - <type>virtual void</type> - <name>virtualFun</name> - <anchorfile>testqdoc-test.html</anchorfile> - <anchor>virtualFun</anchor> - <arglist>()</arglist> - </member> - <member kind="function" protection="public" virtualness="non" static="no"> - <type>bool</type> - <name>operator==</name> - <anchorfile>testqdoc-test.html</anchorfile> - <anchor>operator-eq-eq</anchor> - <arglist>(const TestQDoc::Test &lhs, const TestQDoc::Test &rhs)</arglist> - </member> - <member kind="function" protection="protected" virtualness="non" static="no"> - <type>void</type> - <name>overload</name> - <anchorfile>testqdoc-test.html</anchorfile> - <anchor>overload</anchor> - <arglist>()</arglist> - </member> - <member kind="function" protection="protected" virtualness="non" static="no"> - <type>void</type> - <name>overload</name> - <anchorfile>testqdoc-test.html</anchorfile> - <anchor>overload-1</anchor> - <arglist>(bool b)</arglist> - </member> - <member kind="function" protection="public" virtualness="non" static="no"> - <type></type> - <name>Test</name> - <anchorfile>testqdoc-test.html</anchorfile> - <anchor>Test</anchor> - <arglist>()</arglist> - </member> - <member kind="function" protection="public" virtualness="non" static="no"> - <type>TestQDoc::Test &</type> - <name>operator=</name> - <anchorfile>testqdoc-test.html</anchorfile> - <anchor>operator-eq</anchor> - <arglist>(TestQDoc::Test &&other)</arglist> - </member> - <member kind="function" protection="public" virtualness="non" static="no"> - <type></type> - <name>QDOCTEST_MACRO2</name> - <anchorfile>testqdoc-test.html</anchorfile> - <anchor>QDOCTEST_MACRO2</anchor> - <arglist>(int &x)</arglist> - </member> - </compound> - <compound kind="class"> - <name>TestQDoc::TestDerived</name> - <filename>testqdoc-testderived.html</filename> - <base>Test</base> - <member kind="typedef" type=""> - <name>DerivedType</name> - <anchorfile>testqdoc-testderived.html</anchorfile> - <anchor>DerivedType-typedef</anchor> - <arglist></arglist> - </member> - <member kind="typedef" type=""> - <name>NotTypedef</name> - <anchorfile>testqdoc-testderived.html</anchorfile> - <anchor>NotTypedef-typedef</anchor> - <arglist></arglist> - </member> - <member kind="function" protection="public" virtualness="virtual" static="no"> - <type>virtual void</type> - <name>virtualFun</name> - <anchorfile>testqdoc-testderived.html</anchorfile> - <anchor>virtualFun</anchor> - <arglist>() override</arglist> - </member> - <member kind="function" protection="public" virtualness="non" static="yes"> - <type>void</type> - <name>staticObsoleteMember</name> - <anchorfile>testqdoc-testderived-obsolete.html</anchorfile> - <anchor>staticObsoleteMember</anchor> - <arglist>()</arglist> - </member> - </compound> - <compound kind="class"> - <name>QDoc.Test.Type</name> - <filename>qml-qdoc-test-type.html</filename> - <member kind="function" protection="public" virtualness="non" static="no"> - <type></type> - <name>group.created</name> - <anchorfile>qml-qdoc-test-type.html</anchorfile> - <anchor>group.created-signal</anchor> - <arglist>()</arglist> - </member> - <member kind="function" protection="public" virtualness="non" static="no"> - <type>Type</type> - <name>copy</name> - <anchorfile>qml-qdoc-test-type.html</anchorfile> - <anchor>copy-method</anchor> - <arglist>(a)</arglist> - </member> - <member kind="function" protection="public" virtualness="non" static="no"> - <type></type> - <name>enable</name> - <anchorfile>qml-qdoc-test-type.html</anchorfile> - <anchor>enable-method</anchor> - <arglist>()</arglist> - </member> - <member kind="function" protection="public" virtualness="non" static="no"> - <type></type> - <name>disable</name> - <anchorfile>qml-qdoc-test-type.html</anchorfile> - <anchor>disable-method</anchor> - <arglist>()</arglist> - </member> - <member kind="function" protection="public" virtualness="non" static="no"> - <type></type> - <name>completed</name> - <anchorfile>qml-qdoc-test-type.html</anchorfile> - <anchor>completed-signal</anchor> - <arglist>(int status)</arglist> - </member> - <member kind="function" protection="public" virtualness="non" static="no"> - <type></type> - <name>configured</name> - <anchorfile>qml-qdoc-test-type.html</anchorfile> - <anchor>configured-signal</anchor> - <arglist>()</arglist> - </member> - <member kind="function" protection="public" virtualness="non" static="no"> - <type></type> - <name>deprecatedMethod</name> - <anchorfile>qml-qdoc-test-type-obsolete.html</anchorfile> - <anchor>deprecatedMethod-method</anchor> - <arglist>()</arglist> - </member> - </compound> - <compound kind="class"> - <name>Test.NoVer.TypeNoVersion</name> - <filename>qml-test-nover-typenoversion.html</filename> - </compound> - <compound kind="class"> - <name>QDoc.Test.YetAnotherChild</name> - <filename>qml-qdoc-test-yetanotherchild.html</filename> - </compound> -</tagfile> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/third.html b/tests/auto/qdoc/generatedoutput/expected_output/third.html deleted file mode 100644 index 3ca46d463..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/third.html +++ /dev/null @@ -1,29 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- main.cpp --> - <title>Third Class | TestModule</title> -</head> -<body> -<li>Third</li> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<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> -<!-- $$$Third-description --> -<div class="descr"> -<h2 id="details">Detailed Description</h2> -<p>This is a third class</p> -</div> -<!-- @@@Third --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/toc.html b/tests/auto/qdoc/generatedoutput/expected_output/toc.html deleted file mode 100644 index f34ce0db6..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/toc.html +++ /dev/null @@ -1,29 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- qdoctests-outputfromqdocfiles.qdoc --> - <title>Table of Contents | OutputFromQDocFiles</title> -</head> -<body> -<li id="buildversion">OutputFromQDocFiles - A test project for QDoc build artifacts</li> - <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> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Table of Contents</h1> -<!-- $$$toc.html-description --> -<div class="descr" id="details"> -<ul> -<li><a href="qdoctests-qdocfileoutput.html">QDoc Testing</a></li> -<li><a href="qdoctests-qdocfileoutput-linking.html">QDoc Linking Test</a></li> -<li><a href="toc.html">Table of Contents</a></li> -</ul> -</div> -<!-- @@@toc.html --> -<p class="naviNextPrevious footerNavi"> -<a class="prevPage" href="qdoctests-qdocfileoutput-linking.html">QDoc Linking Test</a> -</p> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html b/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html deleted file mode 100644 index 537bfab91..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html +++ /dev/null @@ -1,23 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- examples.qdoc --> - <title>UI Components | Test</title> -</head> -<body> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">UI Components</h1> -<!-- $$$UIComponents-description --> -<div class="descr" id="details"> -<p>This is a listing of a list of UI components implemented by QML types. These files are available for general import and they are based on the Qt Quick Code Samples.</p> -<p>This module is part of the <a href="test-componentset-example.html">UIComponents</a> example.</p> -</div> -<!-- @@@UIComponents --> -<div class="table"><table class="annotated"> -<tr class="odd topAlign"><td class="tblName"><p><a href="qml-uicomponents-progressbar.html">ProgressBar</a></p></td><td class="tblDescr"><p>A component that shows the progress of an event</p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="qml-uicomponents-switch.html">Switch</a></p></td><td class="tblDescr"><p>A component that can be turned on or off</p></td></tr> -<tr class="odd topAlign"><td class="tblName"><p><a href="qml-uicomponents-tabwidget.html">TabWidget</a></p></td><td class="tblDescr"><p>A widget that places its children as tabs</p></td></tr> -</table></div> -</body> -</html> |