diff options
| author | Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> | 2022-11-24 00:07:55 +0100 |
|---|---|---|
| committer | Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> | 2022-11-29 12:27:34 +0100 |
| commit | 4a47166e7a4c9a7f17e3a5c198a3b64d120cf476 (patch) | |
| tree | 64d5177afd38a2e7cb8e0d92790ab85699e5ea46 /tests | |
| parent | 4106772b57723a8315d5e540305862ed40248594 (diff) | |
| download | qttools-4a47166e7a4c9a7f17e3a5c198a3b64d120cf476.tar.gz | |
qdoc: Append translate attribute to few more blocks
- Auto links
- Qml property summary and method signature
- Anchors
- See also entries
- All C++ classes and QML types list
Task-number: QTBUG-106679
Change-Id: Ib7046321ccac16bf1141885a5cf2d411084f57ab
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Diffstat (limited to 'tests')
72 files changed, 545 insertions, 545 deletions
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/autolinking.html b/tests/auto/qdoc/generatedoutput/expected_output/autolinking.html index 29bfe5c06..0b68b1de8 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/autolinking.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/autolinking.html @@ -18,15 +18,15 @@ <!-- $$$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="testqdoc.html">this</a>. Also,</p> +<p>The string <a href="testqdoc.html" translate="no">TestQDoc</a> links to the C++ namespace unless linking explicitly, <a href="autolinking.html#testqdoc" translate="no">like this</a>, or <a href="testqdoc.html" translate="no">this</a>. Also,</p> <p>Autolinks:</p> <ul> -<li><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></li> +<li><a href="testqdoc-testderived.html" translate="no">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> +<li><a href="testqdoc-testderived.html" translate="no">TestQDoc::TestDerived</a></li> +<li><a href="obsolete-classes.html#testqdoc" translate="no">Obsolete Classes#TestQDoc</a></li> </ul> </div> <!-- @@@autolinking.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 index 8f665610e..8d23c2aef 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/all-namespaces.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/all-namespaces.html @@ -11,8 +11,8 @@ <!-- $$$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> +<tr class="odd topAlign"><td class="tblName" translate="no"><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" translate="no"><p><a href="testqdoc.html">TestQDoc</a></p></td><td class="tblDescr"><p>A namespace</p></td></tr> </table></div> </div> <!-- @@@all-namespaces.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 index 3fcd9d59a..7d40a92d6 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/crossmoduleref-sub-crossmodule.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/crossmoduleref-sub-crossmodule.html @@ -14,10 +14,10 @@ </div> <div class="sidebar-content" id="sidebar-content"></div></div> <h1 class="title" translate="no">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> +<p>The CrossModuleRef namespace includes the following elements from module CrossModule. The full namespace is documented in module TestCPP<a href="crossmoduleref.html" translate="no"> here.</a></p> <h2 id="functions">Functions</h2> <div class="table"><table class="alignedsummary" translate="no"> -<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> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="crossmoduleref-sub-crossmodule.html#documentMeToo" translate="no">documentMeToo</a></b>()</td></tr> </table></div> <div class="func"> <h2>Function Documentation</h2> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype-members.html b/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype-members.html index 0935fd987..1bfd9fef5 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype-members.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype-members.html @@ -11,21 +11,21 @@ <h1 class="title" translate="no">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" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#DerivedType-typedef">DerivedType</a></b></span></li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#NotTypedef-typedef">NotTypedef</a></b></span></li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#SomeType-typedef">SomeType</a></b></span></li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#funcPtr">funcPtr</a></b></span>(bool, const char *) : void (*)(bool)</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#inlineFunction">inlineFunction</a></b></span>()</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#methodWithEmDashInItsDocs">methodWithEmDashInItsDocs</a></b></span>()</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#methodWithEnDashInItsDocs">methodWithEnDashInItsDocs</a></b></span>()</li> -<li class="fn" translate="no"><span class="name"><b><a href="testtype.html#nothing">nothing</a></b></span>()</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#overload">overload</a></b></span>()</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#overload-1">overload</a></b></span>(bool)</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#someFunction">someFunction</a></b></span>(int, int) : int</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#someFunctionDefaultArg">someFunctionDefaultArg</a></b></span>(int, bool)</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#virtualFun">virtualFun</a></b></span>()</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#virtualFun">virtualFun</a></b></span>()</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#operator-eq">operator=</a></b></span>(TestQDoc::Test &&) : TestQDoc::Test &</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#DerivedType-typedef" translate="no">DerivedType</a></b></span></li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#NotTypedef-typedef" translate="no">NotTypedef</a></b></span></li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#SomeType-typedef" translate="no">SomeType</a></b></span></li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#funcPtr" translate="no">funcPtr</a></b></span>(bool, const char *) : void (*)(bool)</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#inlineFunction" translate="no">inlineFunction</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#methodWithEmDashInItsDocs" translate="no">methodWithEmDashInItsDocs</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#methodWithEnDashInItsDocs" translate="no">methodWithEnDashInItsDocs</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testtype.html#nothing" translate="no">nothing</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#overload" translate="no">overload</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#overload-1" translate="no">overload</a></b></span>(bool)</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#someFunction" translate="no">someFunction</a></b></span>(int, int) : int</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#someFunctionDefaultArg" translate="no">someFunctionDefaultArg</a></b></span>(int, bool)</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#virtualFun" translate="no">virtualFun</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#virtualFun" translate="no">virtualFun</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#operator-eq" translate="no">operator=</a></b></span>(TestQDoc::Test &&) : TestQDoc::Test &</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 index b3b3030fc..5f7f09305 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype.html @@ -24,14 +24,14 @@ <!-- @@@TestType --> <div class="table"><table class="alignedsummary" translate="no"> <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> +<tr><td class="memItemLeft rightAlign topAlign"> Inherits:</td><td class="memItemRight bottomAlign"> <a href="testqdoc-testderived.html" translate="no">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" translate="no"> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testtype.html#nothing">nothing</a></b>()</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testtype.html#nothing" translate="no">nothing</a></b>()</td></tr> </table></div> <!-- $$$TestType-description --> <div class="descr"> @@ -39,20 +39,20 @@ <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><a href="testqdoc-testderived.html" translate="no">TestQDoc::TestDerived</a></li> +<li><a href="testqdoc-test.html" translate="no">Test</a> class <a href="testqdoc.html#usage" translate="no">Usage</a>.</li> +<li><a href="testqdoc.html#QDOCTEST_MACRO" translate="no">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> +<tr class="odd topAlign"><td class="tblName" translate="no"><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" translate="no"><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" translate="no"><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> +<p><b>See also </b><a href="testqdoc-test.html#someFunction" translate="no">someFunction</a>().</p> <!-- @@@TestType --> <div class="func"> <h2>Member Function Documentation</h2> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/crossmoduleref.html b/tests/auto/qdoc/generatedoutput/expected_output/crossmoduleref.html index 402abda5f..7c7cae045 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/crossmoduleref.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/crossmoduleref.html @@ -28,8 +28,8 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> </table></div> <h2 id="functions">Functions</h2> <div class="table"><table class="alignedsummary" translate="no"> -<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> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="crossmoduleref.html#documentMe" translate="no">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" translate="no">documentMeToo</a></b>()</td></tr> </table></div> <!-- $$$CrossModuleRef-description --> <div class="descr"> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/classes.html b/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/classes.html index 423ef6b42..ea6b794c0 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/classes.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/classes.html @@ -11,9 +11,9 @@ <!-- $$$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> +<tr class="odd topAlign"><td class="tblName" translate="no"><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" translate="no"><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" translate="no"><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 --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/seenclass.html b/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/seenclass.html index d44f62871..3476daad3 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/seenclass.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/seenclass.html @@ -6,7 +6,7 @@ <title>SeenClass Class | TestCPP</title> </head> <body> -<li><a href="testcpp-module.html">C++ Classes</a></li> +<li><a href="testcpp-module.html" translate="no">C++ Classes</a></li> <li>SeenClass</li> <div class="sidebar"> <div class="toc"> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/first.html b/tests/auto/qdoc/generatedoutput/expected_output/first.html index a9f265000..74033f353 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/first.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/first.html @@ -25,7 +25,7 @@ </ul> <h2 id="public-types">Public Types</h2> <div class="table"><table class="alignedsummary" translate="no"> -<tr><td class="memItemLeft rightAlign topAlign"> class </td><td class="memItemRight bottomAlign"><b><a href="first-nested.html">Nested</a></b></td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> class </td><td class="memItemRight bottomAlign"><b><a href="first-nested.html" translate="no">Nested</a></b></td></tr> </table></div> <!-- $$$First-description --> <div class="descr"> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/globals.html b/tests/auto/qdoc/generatedoutput/expected_output/globals.html index 1d6b8d5ad..92f6883ee 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/globals.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/globals.html @@ -22,8 +22,8 @@ </table></div> <h2 id="related-non-members">Related Non-Members</h2> <div class="table"><table class="alignedsummary" translate="no"> -<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> +<tr><td class="memItemLeft rightAlign topAlign"> int </td><td class="memItemRight bottomAlign"><b><a href="globals.html#foo" translate="no">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" translate="no">foo</a></b>(int <i>a</i>, bool <i>b</i>)</td></tr> </table></div> <!-- $$$Globals-description --> <div class="descr"> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/headerfile/headers.html b/tests/auto/qdoc/generatedoutput/expected_output/headerfile/headers.html index fd53f896e..1a60ec30b 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/headerfile/headers.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/headerfile/headers.html @@ -13,7 +13,7 @@ </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> +<tr class="odd topAlign"><td class="tblName" translate="no"><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 index 9917af95f..ced014be5 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/headerfile/testheader.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/headerfile/testheader.html @@ -6,7 +6,7 @@ <title><TestHeader> - Test Header | HeaderFile</title> </head> <body> -<li><a href="headers.html">Headers</a></li> +<li><a href="headers.html" translate="no">Headers</a></li> <li><TestHeader> - Test Header</li> <div class="sidebar"> <div class="toc"> @@ -25,15 +25,15 @@ </ul> <h2 id="types">Types</h2> <div class="table"><table class="alignedsummary" translate="no"> -<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> +<tr><td class="memItemLeft rightAlign topAlign"> enum </td><td class="memItemRight bottomAlign"><b><a href="testheader.html#Globals-enum" translate="no">Globals</a></b> { Glo, Bal }</td></tr> </table></div> <h2 id="variables">Variables</h2> <div class="table"><table class="alignedsummary" translate="no"> -<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> +<tr><td class="memItemLeft rightAlign topAlign"> const int </td><td class="memItemRight bottomAlign"><b><a href="testheader.html#globalVar-var" translate="no">globalVar</a></b></td></tr> </table></div> <h2 id="functions">Functions</h2> <div class="table"><table class="alignedsummary" translate="no"> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testheader.html#globalFunc">globalFunc</a></b>()</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testheader.html#globalFunc" translate="no">globalFunc</a></b>()</td></tr> </table></div> <!-- $$$<TestHeader>-description --> <div class="descr"> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc-test.html b/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc-test.html index 4cc04722c..b7e3e1d87 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc-test.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc-test.html @@ -6,7 +6,7 @@ <title>Test Class | TestCPP</title> </head> <body> -<li><a href="testcpp-module.html">C++ Classes</a></li> +<li><a href="testcpp-module.html" translate="no">C++ Classes</a></li> <li>Test</li> <div class="sidebar"> <div class="toc"> @@ -22,7 +22,7 @@ </div> <div class="sidebar-content" id="sidebar-content"></div></div> <h1 class="title" translate="no">Test Class</h1> -<span class="small-subtitle" translate="no">class <a href="testqdoc.html">TestQDoc</a>::Test</span> +<span class="small-subtitle" translate="no">class <a href="testqdoc.html" translate="no">TestQDoc</a>::Test</span> <!-- $$$Test-brief --> <p>A class in a namespace. <a href="#details">More...</a></p> <!-- @@@Test --> @@ -32,7 +32,7 @@ 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"> Since:</td><td class="memItemRight bottomAlign"> Qt 2.0</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> +<tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html" translate="no">TestQDoc::TestDerived</a></p> </td></tr> </table></div> <ul> @@ -42,32 +42,32 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> </ul> <h2 id="public-types">Public Types</h2> <div class="table"><table class="alignedsummary" translate="no"> -<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#SomeType-typedef" translate="no">SomeType</a></b></td></tr> </table></div> <h2 id="public-functions">Public Functions</h2> <div class="table"><table class="alignedsummary" translate="no"> -<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"> 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"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#methodWithEmDashInItsDocs">methodWithEmDashInItsDocs</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#methodWithEnDashInItsDocs">methodWithEnDashInItsDocs</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> -<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"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#Test" translate="no">Test</a></b>()</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> void (*)(bool) </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#funcPtr" translate="no">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" translate="no">inlineFunction</a></b>()</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#methodWithEmDashInItsDocs" translate="no">methodWithEmDashInItsDocs</a></b>()</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#methodWithEnDashInItsDocs" translate="no">methodWithEnDashInItsDocs</a></b>()</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> int </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunction" translate="no">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" translate="no">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" translate="no">virtualFun</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" translate="no">operator=</a></b>(TestQDoc::Test &&<i>other</i>)</td></tr> </table></div> <h2 id="protected-functions">Protected Functions</h2> <div class="table"><table class="alignedsummary" translate="no"> -<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> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#overload" translate="no">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" translate="no">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" translate="no"> -<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> +<tr><td class="memItemLeft rightAlign topAlign"> bool </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#operator-eq-eq" translate="no">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" translate="no"> -<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#QDOCTEST_MACRO2" translate="no">QDOCTEST_MACRO2</a></b>(int &<i>x</i>)</td></tr> </table></div> <!-- $$$Test-description --> <div class="descr"> @@ -106,7 +106,7 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> <p>-----------------------------------------------------------------------</p> <p>People can still add a bunch of dashes, though, without QDoc replacing them all with a series of em dashes.</p> <p>—You can also start a new paragraph with an em dash, if you want to.</p> -<p><b>See also </b><a href="testqdoc-test.html#methodWithEnDashInItsDocs">methodWithEnDashInItsDocs</a>.</p> +<p><b>See also </b><a href="testqdoc-test.html#methodWithEnDashInItsDocs" translate="no">methodWithEnDashInItsDocs</a>.</p> <!-- @@@methodWithEmDashInItsDocs --> <!-- $$$methodWithEnDashInItsDocs[overload1]$$$methodWithEnDashInItsDocs --> <h3 class="fn" translate="no" id="methodWithEnDashInItsDocs"><span class="type">void</span> Test::<span class="name">methodWithEnDashInItsDocs</span>()</h3> @@ -135,14 +135,14 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> <p>Function that must be reimplemented.</p> <!-- @@@virtualFun --> <!-- $$$operator=[overload1]$$$operator=TestQDoc::Test&& --> -<h3 class="fn" translate="no" id="operator-eq"><code translate="no">[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> +<h3 class="fn" translate="no" id="operator-eq"><code translate="no">[default] </code><span class="type"><a href="testqdoc-test.html" translate="no">TestQDoc::Test</a></span> &Test::<span class="name">operator=</span>(<span class="type"><a href="testqdoc-test.html" translate="no">TestQDoc::Test</a></span> &&<i>other</i>)</h3> <p>Move-assigns <i translate="no">other</i>.</p> <!-- @@@operator= --> </div> <div class="relnonmem"> <h2>Related Non-Members</h2> <!-- $$$operator==[overload1]$$$operator==constTestQDoc::Test&constTestQDoc::Test& --> -<h3 class="fn" translate="no" 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> +<h3 class="fn" translate="no" id="operator-eq-eq"><span class="type">bool</span> <span class="name">operator==</span>(const <span class="type"><a href="testqdoc-test.html" translate="no">TestQDoc::Test</a></span> &<i>lhs</i>, const <span class="type"><a href="testqdoc-test.html" translate="no">TestQDoc::Test</a></span> &<i>rhs</i>)</h3> <p>Returns true if <i translate="no">lhs</i> and <i translate="no">rhs</i> are equal.</p> <!-- @@@operator== --> </div> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html b/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html index 451e0ecdb..930d20d02 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html @@ -30,12 +30,12 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> </table></div> <h2 id="classes">Classes</h2> <div class="table"><table class="alignedsummary" translate="no"> -<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> +<tr><td class="memItemLeft rightAlign topAlign"> class </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html" translate="no">Test</a></b></td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> class </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html" translate="no">TestDerived</a></b></td></tr> </table></div> <h2 id="macros">Macros</h2> <div class="table"><table class="alignedsummary" translate="no"> -<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc.html#QDOCTEST_MACRO">QDOCTEST_MACRO</a></b></td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc.html#QDOCTEST_MACRO" translate="no">QDOCTEST_MACRO</a></b></td></tr> </table></div> <!-- $$$TestQDoc-description --> <div class="descr"> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/index.html b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/index.html index 33e984136..027d13955 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/index.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/index.html @@ -11,14 +11,14 @@ <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> +<tr class="odd topAlign"><td class="tblName" translate="no"><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" translate="no"><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> +<tr class="odd topAlign"><td class="tblName" translate="no"><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" translate="no"><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" translate="no"><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> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent-members.html b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent-members.html index 150a7697e..adecd9626 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent-members.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent-members.html @@ -6,14 +6,14 @@ <title>List of All Members for AbstractParent | Test</title> </head> <body> -<li><a href="qdoc-test-qmlmodule.html">Types</a></li> +<li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li> <li>AbstractParent</li> <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> <h1 class="title" translate="no">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" translate="no"><b><a href="qml-qdoc-test-abstractparent.html#children-prop">children</a></b> : list<Child> [default]</li> -<li class="fn" translate="no">void <b><a href="qml-qdoc-test-abstractparent.html#rear-method">rear</a></b>(Child <i>child</i>)</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-abstractparent.html#children-prop" translate="no">children</a></b> : list<Child> [default]</li> +<li class="fn" translate="no">void <b><a href="qml-qdoc-test-abstractparent.html#rear-method" translate="no">rear</a></b>(Child <i>child</i>)</li> </ul> </body> </html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent.html b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent.html index 890098bd1..1e81b97bc 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent.html @@ -6,7 +6,7 @@ <title>AbstractParent QML Type | Test</title> </head> <body> -<li><a href="qdoc-test-qmlmodule.html">Types</a></li> +<li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li> <li>AbstractParent</li> <div class="sidebar"> <div class="toc"> @@ -23,17 +23,17 @@ <p>Abstract base QML type. <a href="#details">More...</a></p> <!-- @@@AbstractParent --> <div class="table"><table class="alignedsummary" translate="no"> -<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"> Qt 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> +<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"> Qt 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" translate="no">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" translate="no"><b><a href="qml-qdoc-test-abstractparent.html#children-prop">children</a></b> : list<Child></li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-abstractparent.html#children-prop" translate="no">children</a></b> : list<Child></li> </ul> <h2 id="methods">Methods</h2> <ul> -<li class="fn" translate="no">void <b><a href="qml-qdoc-test-abstractparent.html#rear-method">rear</a></b>(Child <i>child</i>)</li> +<li class="fn" translate="no">void <b><a href="qml-qdoc-test-abstractparent.html#rear-method" translate="no">rear</a></b>(Child <i>child</i>)</li> </ul> <!-- $$$AbstractParent-description --> <h2 id="details">Detailed Description</h2> @@ -41,11 +41,11 @@ <!-- @@@AbstractParent --> <h2>Property Documentation</h2> <!-- $$$children --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <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> +<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" translate="no">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> @@ -53,11 +53,11 @@ <br/> <h2>Method Documentation</h2> <!-- $$$rear[overload1]$$$rearChild --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <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> +<span class="type">void</span> <span class="name">rear</span>(<span class="type"><a href="qml-qdoc-test-child.html" translate="no">Child</a></span> <i>child</i>)</p></td></tr> </table></div></div> <div class="qmldoc"><p>Do some abstract parenting on <i translate="no">child</i>.</p> <p>Test include file that is part of the sourcedirs.</p> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/index-linking.html b/tests/auto/qdoc/generatedoutput/expected_output/index-linking.html index 89d59dfc9..09d3ef0fd 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/index-linking.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/index-linking.html @@ -18,8 +18,8 @@ <!-- $$$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="https://doc.qt.io/QmlPropertyGroups/qml-qdoc-test-parent.html#group-prop">Parent::group</a>.</li> -<li>Property in a group: <a href="https://doc.qt.io/QmlPropertyGroups/qml-qdoc-test-parent.html#group.c-prop">QDoc.Test::Parent::group.c</a>.</li> +<ol class="A" type="A"><li>Property group: <a href="https://doc.qt.io/QmlPropertyGroups/qml-qdoc-test-parent.html#group-prop" translate="no">Parent::group</a>.</li> +<li>Property in a group: <a href="https://doc.qt.io/QmlPropertyGroups/qml-qdoc-test-parent.html#group.c-prop" translate="no">QDoc.Test::Parent::group.c</a>.</li> </ol> </div> <!-- @@@index-linking.html --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/index.html b/tests/auto/qdoc/generatedoutput/expected_output/index.html index 4593e3419..f934cfdca 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/index.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/index.html @@ -10,10 +10,10 @@ <!-- $$$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> +<tr class="odd topAlign"><td class="tblName" translate="no"><p><a href="first.html">First</a></p></td></tr> +<tr class="even topAlign"><td class="tblName" translate="no"><p><a href="first-nested.html">First::Nested</a></p></td></tr> +<tr class="odd topAlign"><td class="tblName" translate="no"><p><a href="second.html">Second</a></p></td></tr> +<tr class="even topAlign"><td class="tblName" translate="no"><p><a href="third.html">Third</a></p></td></tr> </table></div> </div> <!-- @@@index.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 index 4a5634454..77dbd7d86 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/nestedmacro/testcpp-module.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/nestedmacro/testcpp-module.html @@ -25,13 +25,13 @@ <p>This module was introduced in Qt 2.0.</p> <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> +<tr class="odd topAlign"><td class="tblName" translate="no"><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" translate="no"><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> +<tr class="odd topAlign"><td class="tblName" translate="no"><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" translate="no"><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"> @@ -43,13 +43,13 @@ <p>1.0</p> <h3 id="linking-to-function-like-things">Linking to function-like things</h3> <ul> -<li><a href="testqdoc-test.html#someFunctionDefaultArg">someFunctionDefaultArg</a>()</li> -<li><a href="testqdoc-test.html#QDOCTEST_MACRO2">QDOCTEST_MACRO2</a>()</li> -<li><a href="testqdoc-test.html#QDOCTEST_MACRO2">QDOCTEST_MACRO2</a>(int &x)</li> -<li><a href="testcpp-module.html#section">section()</a></li> -<li><a href="testcpp-module.html#section">section() is a section title</a></li> -<li><a href="testqdoc-test.html#Test">open( parenthesis</a></li> -<li><a href="https://en.cppreference.com/w/cpp/utility/move">C++11 added std::move(T&& t)</a></li> +<li><a href="testqdoc-test.html#someFunctionDefaultArg" translate="no">someFunctionDefaultArg</a>()</li> +<li><a href="testqdoc-test.html#QDOCTEST_MACRO2" translate="no">QDOCTEST_MACRO2</a>()</li> +<li><a href="testqdoc-test.html#QDOCTEST_MACRO2" translate="no">QDOCTEST_MACRO2</a>(int &x)</li> +<li><a href="testcpp-module.html#section" translate="no">section()</a></li> +<li><a href="testcpp-module.html#section" translate="no">section() is a section title</a></li> +<li><a href="testqdoc-test.html#Test" translate="no">open( parenthesis</a></li> +<li><a href="https://en.cppreference.com/w/cpp/utility/move" translate="no">C++11 added std::move(T&& t)</a></li> </ul> <h4 id="section">section()</h4> </div> 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 index f28b5441d..03689a5e6 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/test-componentset-example.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/noautolist/test-componentset-example.html @@ -24,9 +24,9 @@ <!-- $$$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> +<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" translate="no">UI Components</a> module.</p> +<p>The uicomponents.qdoc file generates the overview page for the <a href="uicomponents-qmlmodule.html" translate="no">UI Components</a> module page.</p> +<p>The generated documentation is available in the <a href="uicomponents-qmlmodule.html" translate="no">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 translate="no">UIComponents</code> module.</p> <p>QDoc uses the \brief command to place a basic description when listing the types.</p> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/testcpp-module.html b/tests/auto/qdoc/generatedoutput/expected_output/noautolist/testcpp-module.html index ea76dfb2d..ebcc86226 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/testcpp-module.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/noautolist/testcpp-module.html @@ -29,13 +29,13 @@ </div> <h3 id="linking-to-function-like-things">Linking to function-like things</h3> <ul> -<li><a href="testqdoc-test.html#someFunctionDefaultArg">someFunctionDefaultArg</a>()</li> -<li><a href="testqdoc-test.html#QDOCTEST_MACRO2">QDOCTEST_MACRO2</a>()</li> -<li><a href="testqdoc-test.html#QDOCTEST_MACRO2">QDOCTEST_MACRO2</a>(int &x)</li> -<li><a href="testcpp-module.html#section">section()</a></li> -<li><a href="testcpp-module.html#section">section() is a section title</a></li> -<li><a href="testqdoc-test.html#Test">open( parenthesis</a></li> -<li><a href="https://en.cppreference.com/w/cpp/utility/move">C++11 added std::move(T&& t)</a></li> +<li><a href="testqdoc-test.html#someFunctionDefaultArg" translate="no">someFunctionDefaultArg</a>()</li> +<li><a href="testqdoc-test.html#QDOCTEST_MACRO2" translate="no">QDOCTEST_MACRO2</a>()</li> +<li><a href="testqdoc-test.html#QDOCTEST_MACRO2" translate="no">QDOCTEST_MACRO2</a>(int &x)</li> +<li><a href="testcpp-module.html#section" translate="no">section()</a></li> +<li><a href="testcpp-module.html#section" translate="no">section() is a section title</a></li> +<li><a href="testqdoc-test.html#Test" translate="no">open( parenthesis</a></li> +<li><a href="https://en.cppreference.com/w/cpp/utility/move" translate="no">C++11 added std::move(T&& t)</a></li> </ul> <h4 id="section">section()</h4> </div> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/obsolete-classes.html b/tests/auto/qdoc/generatedoutput/expected_output/obsolete-classes.html index 19edb918c..495d2340a 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/obsolete-classes.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/obsolete-classes.html @@ -19,7 +19,7 @@ <!-- $$$obsolete-classes.html-description --> <div class="descr" id="details"> <h2 id="classes-with-obsolete-members">Classes with obsolete members</h2> -<div class="flowListDiv"> +<div class="flowListDiv" translate="no"> <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> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/properties/qml-thetype.html b/tests/auto/qdoc/generatedoutput/expected_output/properties/qml-thetype.html index 6ffb5de9b..bb034a227 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/properties/qml-thetype.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/properties/qml-thetype.html @@ -18,19 +18,19 @@ <div class="sidebar-content" id="sidebar-content"></div></div> <h1 class="title" translate="no">TheType QML Type</h1> <div class="table"><table class="alignedsummary" translate="no"> -<tr><td class="memItemLeft rightAlign topAlign"> Instantiates:</td><td class="memItemRight bottomAlign"> <a href="testqdoc-testderived.html">TestDerived</a></td></tr></table></div><ul> +<tr><td class="memItemLeft rightAlign topAlign"> Instantiates:</td><td class="memItemRight bottomAlign"> <a href="testqdoc-testderived.html" translate="no">TestDerived</a></td></tr></table></div><ul> <li><a href="qml-thetype-members.html">List of all members, including inherited members</a></li> </ul> <h2 id="properties">Properties</h2> <ul> -<li class="fn" translate="no"><b><a href="qml-thetype.html#name-prop">name</a></b> : string</li> +<li class="fn" translate="no"><b><a href="qml-thetype.html#name-prop" translate="no">name</a></b> : string</li> </ul> <!-- $$$TheType-description --> <h2 id="details">Detailed Description</h2> <!-- @@@TheType --> <h2>Property Documentation</h2> <!-- $$$name --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="name-prop"> <td class="tblQmlPropNode"><p> 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 index 2bd0d9e2f..c1bc22f3d 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived-members.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived-members.html @@ -6,41 +6,41 @@ <title>List of All Members for TestDerived | TestCPP</title> </head> <body> -<li><a href="testcpp-module.html">C++ Classes</a></li> +<li><a href="testcpp-module.html" translate="no">C++ Classes</a></li> <li>TestDerived</li> <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> <h1 class="title" translate="no">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" translate="no"> <tr><td class="topAlign"><ul> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#DerivedType-typedef">DerivedType</a></b></span></li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#NotTypedef-typedef">NotTypedef</a></b></span></li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#SomeType-typedef">SomeType</a></b></span></li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#bindableProp-prop">bindableProp</a></b></span>() : QBindable<QString></li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#bindableProp-prop">bindablePropChanged</a></b></span>()</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#boolProp-prop">boolProp</a></b></span>() : bool</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#boolProp-prop">boolPropChanged</a></b></span>()</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#emitSomething">emitSomething</a></b></span>()</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#funcPtr">funcPtr</a></b></span>(bool, const char *) : void (*)(bool)</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#intProp-prop">getInt</a></b></span>() : int *</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#id">id</a></b></span>() : int</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#inlineFunction">inlineFunction</a></b></span>()</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#invokeMe">invokeMe</a></b></span>() const</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#methodWithEmDashInItsDocs">methodWithEmDashInItsDocs</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#DerivedType-typedef" translate="no">DerivedType</a></b></span></li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#NotTypedef-typedef" translate="no">NotTypedef</a></b></span></li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#SomeType-typedef" translate="no">SomeType</a></b></span></li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#bindableProp-prop" translate="no">bindableProp</a></b></span>() : QBindable<QString></li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#bindableProp-prop" translate="no">bindablePropChanged</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#boolProp-prop" translate="no">boolProp</a></b></span>() : bool</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#boolProp-prop" translate="no">boolPropChanged</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#emitSomething" translate="no">emitSomething</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#funcPtr" translate="no">funcPtr</a></b></span>(bool, const char *) : void (*)(bool)</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#intProp-prop" translate="no">getInt</a></b></span>() : int *</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#id" translate="no">id</a></b></span>() : int</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#inlineFunction" translate="no">inlineFunction</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#invokeMe" translate="no">invokeMe</a></b></span>() const</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#methodWithEmDashInItsDocs" translate="no">methodWithEmDashInItsDocs</a></b></span>()</li> </ul></td><td class="topAlign"><ul> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#methodWithEnDashInItsDocs">methodWithEnDashInItsDocs</a></b></span>()</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#name-prop">name</a></b></span>() const : const QString *</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#overload">overload</a></b></span>()</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#overload-1">overload</a></b></span>(bool)</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#boolProp-prop">resetBoolProp</a></b></span>()</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#bindableProp-prop">setBindableProp</a></b></span>(const QString &)</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#boolProp-prop">setBoolProp</a></b></span>(bool)</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#someFunction">someFunction</a></b></span>(int, int) : int</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#someFunctionDefaultArg">someFunctionDefaultArg</a></b></span>(int, bool)</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#someProp-prop">someProp</a></b></span>() : const QString &</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#virtualFun">virtualFun</a></b></span>()</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#virtualFun">virtualFun</a></b></span>()</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#operator-eq">operator=</a></b></span>(TestQDoc::Test &&) : TestQDoc::Test &</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#methodWithEnDashInItsDocs" translate="no">methodWithEnDashInItsDocs</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#name-prop" translate="no">name</a></b></span>() const : const QString *</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#overload" translate="no">overload</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#overload-1" translate="no">overload</a></b></span>(bool)</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#boolProp-prop" translate="no">resetBoolProp</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#bindableProp-prop" translate="no">setBindableProp</a></b></span>(const QString &)</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#boolProp-prop" translate="no">setBoolProp</a></b></span>(bool)</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#someFunction" translate="no">someFunction</a></b></span>(int, int) : int</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#someFunctionDefaultArg" translate="no">someFunctionDefaultArg</a></b></span>(int, bool)</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#someProp-prop" translate="no">someProp</a></b></span>() : const QString &</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#virtualFun" translate="no">virtualFun</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#virtualFun" translate="no">virtualFun</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#operator-eq" translate="no">operator=</a></b></span>(TestQDoc::Test &&) : TestQDoc::Test &</li> </ul> </td></tr> </table></div> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived.html b/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived.html index e358f5edf..123a33102 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived.html @@ -6,7 +6,7 @@ <title>TestDerived Class | TestCPP</title> </head> <body> -<li><a href="testcpp-module.html">C++ Classes</a></li> +<li><a href="testcpp-module.html" translate="no">C++ Classes</a></li> <li>TestDerived</li> <div class="sidebar"> <div class="toc"> @@ -23,7 +23,7 @@ </div> <div class="sidebar-content" id="sidebar-content"></div></div> <h1 class="title" translate="no">TestDerived Class</h1> -<span class="small-subtitle" translate="no">class <a href="testqdoc.html">TestQDoc</a>::TestDerived</span> +<span class="small-subtitle" translate="no">class <a href="testqdoc.html" translate="no">TestQDoc</a>::TestDerived</span> <!-- $$$TestDerived-brief --> <p>A derived class in a namespace. <a href="#details">More...</a></p> <!-- @@@TestDerived --> @@ -33,8 +33,8 @@ 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"> Since:</td><td class="memItemRight bottomAlign"> Qt 2.0</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> Instantiated By:</td><td class="memItemRight bottomAlign"> <a href="qml-thetype.html">TheType</a></td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> Inherits:</td><td class="memItemRight bottomAlign"> <a href="testqdoc-test.html">TestQDoc::Test</a></td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> Instantiated By:</td><td class="memItemRight bottomAlign"> <a href="qml-thetype.html" translate="no">TheType</a></td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> Inherits:</td><td class="memItemRight bottomAlign"> <a href="testqdoc-test.html" translate="no">TestQDoc::Test</a></td></tr> </table></div> <ul> <li><a href="testqdoc-testderived-members.html">List of all members, including inherited members</a></li> @@ -42,46 +42,46 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> </ul> <h2 id="public-types">Public Types</h2> <div class="table"><table class="alignedsummary" translate="no"> -<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> +<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#DerivedType-typedef" translate="no">DerivedType</a></b></td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#NotTypedef-typedef" translate="no">NotTypedef</a></b></td></tr> </table></div> <h2 id="properties">Properties</h2> -<div class="table"><table class="propsummary"> +<div class="table"><table class="propsummary" translate="no"> <tr><td class="topAlign"><ul> -<li class="fn" translate="no"><b><a href="testqdoc-testderived.html#bindableProp-prop">bindableProp</a></b> : QString</li> -<li class="fn" translate="no"><b><a href="testqdoc-testderived.html#boolProp-prop">boolProp</a></b> : bool</li> -<li class="fn" translate="no"><b><a href="testqdoc-testderived.html#intProp-prop">intProp</a></b> : int* const</li> +<li class="fn" translate="no"><b><a href="testqdoc-testderived.html#bindableProp-prop" translate="no">bindableProp</a></b> : QString</li> +<li class="fn" translate="no"><b><a href="testqdoc-testderived.html#boolProp-prop" translate="no">boolProp</a></b> : bool</li> +<li class="fn" translate="no"><b><a href="testqdoc-testderived.html#intProp-prop" translate="no">intProp</a></b> : int* const</li> </ul></td><td class="topAlign"><ul> -<li class="fn" translate="no"><b><a href="testqdoc-testderived.html#name-prop">name</a></b> : const QString*</li> -<li class="fn" translate="no"><b><a href="testqdoc-testderived.html#someProp-prop">someProp</a></b> : QString</li> +<li class="fn" translate="no"><b><a href="testqdoc-testderived.html#name-prop" translate="no">name</a></b> : const QString*</li> +<li class="fn" translate="no"><b><a href="testqdoc-testderived.html#someProp-prop" translate="no">someProp</a></b> : QString</li> </ul> </td></tr> </table></div> <h2 id="public-functions">Public Functions</h2> <div class="table"><table class="alignedsummary" translate="no"> -<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> +<tr><td class="memItemLeft rightAlign topAlign"> QBindable<QString> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#bindableProp-prop" translate="no">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" translate="no">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" translate="no">getInt</a></b>()</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#invokeMe" translate="no">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" translate="no">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" translate="no">someProp</a></b>()</td></tr> </table></div> <h2 id="reimplemented-public-functions">Reimplemented Public Functions</h2> <div class="table"><table class="alignedsummary" translate="no"> -<tr><td class="memItemLeft rightAlign topAlign"> virtual int </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#id">id</a></b>() override</td></tr> -<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> +<tr><td class="memItemLeft rightAlign topAlign"> virtual int </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#id" translate="no">id</a></b>() override</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> virtual void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#virtualFun" translate="no">virtualFun</a></b>() override</td></tr> </table></div> <h2 id="public-slots">Public Slots</h2> <div class="table"><table class="alignedsummary" translate="no"> -<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> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#boolProp-prop" translate="no">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" translate="no">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" translate="no">setBoolProp</a></b>(bool <i>b</i>)</td></tr> </table></div> <h2 id="signals">Signals</h2> <div class="table"><table class="alignedsummary" translate="no"> -<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> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#bindableProp-prop" translate="no">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" translate="no">boolPropChanged</a></b>()</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#emitSomething" translate="no">emitSomething</a></b>()</td></tr> </table></div> <!-- $$$TestDerived-description --> <div class="descr"> @@ -103,7 +103,7 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> <h2>Property Documentation</h2> <!-- $$$bindableProp-prop$$$bindableProp$$$setBindablePropconstQString&$$$bindablePropChanged --> <h3 class="fn" translate="no" id="bindableProp-prop"><code translate="no">[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><b>Note: </b>This property supports <a href="https://wiki.qt.io/QProperty" translate="no">QProperty</a> bindings.</p> <p>Some property.</p> <!-- @@@bindableProp --> <!-- $$$boolProp-prop$$$boolProp$$$setBoolPropbool$$$resetBoolProp$$$boolPropChanged --> @@ -138,7 +138,7 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> <!-- @@@name --> <!-- $$$someProp-prop$$$someProp --> <h3 class="fn" translate="no" id="someProp-prop"><code translate="no">[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><b>Note: </b>This property supports <a href="https://wiki.qt.io/QProperty" translate="no">QProperty</a> bindings.</p> <p>Another property.</p> <!-- @@@someProp --> </div> @@ -151,7 +151,7 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> <!-- @@@emitSomething --> <!-- $$$id[overload1]$$$id --> <h3 class="fn" translate="no" id="id"><code translate="no">[override virtual] </code><span class="type">int</span> TestDerived::<span class="name">id</span>()</h3> -<p>Reimplements an access function for property: <a href="testqdoc-test.html#id-prop">Test::id</a>.</p> +<p>Reimplements an access function for property: <a href="testqdoc-test.html#id-prop" translate="no">Test::id</a>.</p> <!-- @@@id --> <!-- $$$invokeMe[overload1]$$$invokeMe --> <h3 class="fn" translate="no" id="invokeMe"><code translate="no">[invokable] </code><span class="type">void</span> TestDerived::<span class="name">invokeMe</span>() const</h3> @@ -160,7 +160,7 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> <!-- @@@invokeMe --> <!-- $$$virtualFun[overload1]$$$virtualFun --> <h3 class="fn" translate="no" id="virtualFun"><code translate="no">[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> +<p>Reimplements: <a href="testqdoc-test.html#virtualFun" translate="no">Test::virtualFun</a>().</p> <!-- @@@virtualFun --> </div> </body> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/proxypage/stdpair-proxy.html b/tests/auto/qdoc/generatedoutput/expected_output/proxypage/stdpair-proxy.html index d08ba16d7..5b542adb4 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/proxypage/stdpair-proxy.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/proxypage/stdpair-proxy.html @@ -8,7 +8,7 @@ <h1 class="title">StdPair Proxy Page</h1> <h2 id="types">Types</h2> <div class="table"><table class="alignedsummary" translate="no"> -<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="stdpair-proxy.html#StdPair-typedef">StdPair</a></b></td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="stdpair-proxy.html#StdPair-typedef" translate="no">StdPair</a></b></td></tr> </table></div> <div class="types"> <h2>Type Documentation</h2> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html b/tests/auto/qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html index 4855dd8cd..121d24018 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html @@ -15,12 +15,12 @@ </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> +<tr class="odd topAlign"><td class="tblName" translate="no"><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" translate="no"><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" translate="no"><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" translate="no"><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" translate="no"><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" translate="no"><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.html b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html index aa157d1bd..1f09f0f2b 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html @@ -45,14 +45,14 @@ <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> +<li><a href="qdoctests-qdocfileoutput-linking.html" translate="no">Linking to a page title</a></li> +<li><a href="qdoctests-qdocfileoutput-linking.html#link-targets" translate="no">Linking to a section title</a></li> +<li><a href="qdoctests-qdocfileoutput-linking.html#link-test-target" translate="no">Linking using a \target string</a></li> +<li><a href="qdoctests-qdocfileoutput-linking.html" translate="no">Linking using a \keyword string</a></li> </ul> <h2 id="qdoc-linking-test">QDoc Linking Test</h2> <p>This section title is overridden by another target which takes precedence.</p> -<h2 id="linking-to-something-in-a-section-title">Linking to <a href="qdoctests-qdocfileoutput.html#further-information">something</a> in a section title</h2> +<h2 id="linking-to-something-in-a-section-title">Linking to <a href="qdoctests-qdocfileoutput.html#further-information" translate="no">something</a> in a section title</h2> <p>This is allowed but a questionable practice.</p> </div> <!-- @@@qdoctests-qdocfileoutput.html --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html index 5f286a10a..53b91bc8b 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html @@ -6,7 +6,7 @@ <title>int QML Basic Type | Test</title> </head> <body> -<li><a href="qdoc-test-qmlmodule.html">Types</a></li> +<li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li> <li>int</li> <div class="sidebar"> <div class="toc"> @@ -23,7 +23,7 @@ <!-- @@@int --> <h2 id="methods">Methods</h2> <ul> -<li class="fn" translate="no">int <b><a href="qml-int.html#abs-method">abs</a></b>()</li> +<li class="fn" translate="no">int <b><a href="qml-int.html#abs-method" translate="no">abs</a></b>()</li> </ul> <!-- $$$int-description --> <div class="descr" id="details"> @@ -31,11 +31,11 @@ <!-- @@@int --> <h2>Method Documentation</h2> <!-- $$$abs[overload1]$$$abs --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <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> +<span class="type"><a href="qml-int.html" translate="no">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 --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-linkmodule-grandchild-members.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-linkmodule-grandchild-members.html index 61345f489..79f54c827 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-linkmodule-grandchild-members.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-linkmodule-grandchild-members.html @@ -6,21 +6,21 @@ <title>List of All Members for GrandChild | IndexLinking</title> </head> <body> -<li><a href="linkmodule-qmlmodule.html">LinkModule</a></li> +<li><a href="linkmodule-qmlmodule.html" translate="no">LinkModule</a></li> <li>GrandChild</li> <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> <h1 class="title" translate="no">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="https://doc.qt.io/QmlPropertyGroups/qml-qdoc-test-anotherchild.html">AnotherChild</a>.</p> <ul> -<li class="fn" translate="no"><b><a href="https://doc.qt.io/QmlPropertyGroups/qml-qdoc-test-anotherchild.html#name-prop">name</a></b> : string</li> +<li class="fn" translate="no"><b><a href="https://doc.qt.io/QmlPropertyGroups/qml-qdoc-test-anotherchild.html#name-prop" translate="no">name</a></b> : string</li> </ul> <p>The following members are inherited from <a href="https://doc.qt.io/QmlPropertyGroups/qml-qdoc-test-parent.html">Parent</a>.</p> <ul> -<li class="fn" translate="no"><b><a href="https://doc.qt.io/QmlPropertyGroups/qml-qdoc-test-parent.html#group-prop">group</a></b> : </li> -<li class="fn" translate="no"><b><a href="https://doc.qt.io/QmlPropertyGroups/qml-qdoc-test-parent.html#group.a-prop">group.a</a></b> : int</li> -<li class="fn" translate="no"><b><a href="https://doc.qt.io/QmlPropertyGroups/qml-qdoc-test-parent.html#group.b-prop">group.b</a></b> : int</li> -<li class="fn" translate="no"><b><a href="https://doc.qt.io/QmlPropertyGroups/qml-qdoc-test-parent.html#group.c-prop">group.c</a></b> : int</li> +<li class="fn" translate="no"><b><a href="https://doc.qt.io/QmlPropertyGroups/qml-qdoc-test-parent.html#group-prop" translate="no">group</a></b> : </li> +<li class="fn" translate="no"><b><a href="https://doc.qt.io/QmlPropertyGroups/qml-qdoc-test-parent.html#group.a-prop" translate="no">group.a</a></b> : int</li> +<li class="fn" translate="no"><b><a href="https://doc.qt.io/QmlPropertyGroups/qml-qdoc-test-parent.html#group.b-prop" translate="no">group.b</a></b> : int</li> +<li class="fn" translate="no"><b><a href="https://doc.qt.io/QmlPropertyGroups/qml-qdoc-test-parent.html#group.c-prop" translate="no">group.c</a></b> : int</li> </ul> </body> </html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-abstractparent.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-abstractparent.html index 0e4870253..e0a47f7c2 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-abstractparent.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-abstractparent.html @@ -6,7 +6,7 @@ <title>AbstractParent QML Type | Test</title> </head> <body> -<li><a href="qdoc-test-qmlmodule.html">Types</a></li> +<li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li> <li>AbstractParent</li> <div class="sidebar"> <div class="toc"> @@ -23,37 +23,37 @@ <p>Abstract base QML type. <a href="#details">More...</a></p> <!-- @@@AbstractParent --> <div class="table"><table class="alignedsummary" translate="no"> -<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"> Qt 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> +<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"> Qt 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" translate="no">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" translate="no"><b><a href="qml-qdoc-test-abstractparent.html#children-prop">children</a></b> : list<Child></li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-abstractparent.html#name-prop">name</a></b> : string</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-abstractparent.html#children-prop" translate="no">children</a></b> : list<Child></li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-abstractparent.html#name-prop" translate="no">name</a></b> : string</li> </ul> <h2 id="methods">Methods</h2> <ul> -<li class="fn" translate="no">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" translate="no">void <b><a href="qml-qdoc-test-abstractparent.html#name-method-1">name</a></b>()</li> -<li class="fn" translate="no">void <b><a href="qml-qdoc-test-abstractparent.html#rear-method">rear</a></b>(Child <i>child</i>, var <i>method</i>)</li> +<li class="fn" translate="no">void <b><a href="qml-qdoc-test-abstractparent.html#name-method" translate="no">name</a></b>(Child <i>child</i>, <i>name</i>)</li> +<li class="fn" translate="no">void <b><a href="qml-qdoc-test-abstractparent.html#name-method-1" translate="no">name</a></b>()</li> +<li class="fn" translate="no">void <b><a href="qml-qdoc-test-abstractparent.html#rear-method" translate="no">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="qmlitem"><div class="qmlproto" translate="no"> <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> +<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" translate="no">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="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="name-prop"> <td class="tblQmlPropNode"><p> @@ -64,17 +64,17 @@ <br/> <h2>Method Documentation</h2> <!-- $$$name[overload1]$$$nameChild --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <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> +<span class="type">void</span> <span class="name">name</span>(<span class="type"><a href="qml-qdoc-test-child.html" translate="no">Child</a></span> <i>child</i>, <i>name</i>)</p></td></tr> </table></div></div> <div class="qmldoc"><p>Name a <i translate="no">child</i> using <i translate="no">name</i>.</p> </div></div><!-- @@@name --> <br/> <!-- $$$name$$$name --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="name-method-1"> <td class="tblQmlFuncNode"><p> @@ -84,11 +84,11 @@ </div></div><!-- @@@name --> <br/> <!-- $$$rear[overload1]$$$rearChildvar --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <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> +<span class="type">void</span> <span class="name">rear</span>(<span class="type"><a href="qml-qdoc-test-child.html" translate="no">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 translate="no">child</i> using a specific <i translate="no">method</i>.</p> </div></div><!-- @@@rear --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-child.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-child.html index e781775c3..91ad38af8 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-child.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-child.html @@ -6,7 +6,7 @@ <title>Child QML Type | Test</title> </head> <body> -<li><a href="qdoc-test-qmlmodule.html">Types</a></li> +<li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li> <li>Child</li> <div class="sidebar"> <div class="toc"> @@ -23,37 +23,37 @@ <p>A Child inheriting its parent. <a href="#details">More...</a></p> <!-- @@@Child --> <div class="table"><table class="alignedsummary" translate="no"> -<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"> Qt 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> +<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"> Qt 1.1</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherits:</td><td class="memItemRight bottomAlign"> <p><a href="qml-qdoc-test-abstractparent.html" translate="no">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" translate="no"><b><a href="qml-qdoc-test-child.html#children-prop">children</a></b> : list<Child></li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-child.html#name-prop">name</a></b> : string</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-child.html#children-prop" translate="no">children</a></b> : list<Child></li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-child.html#name-prop" translate="no">name</a></b> : string</li> </ul> <h2 id="methods">Methods</h2> <ul> -<li class="fn" translate="no">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" translate="no">void <b><a href="qml-qdoc-test-child.html#name-method-1">name</a></b>()</li> -<li class="fn" translate="no">void <b><a href="qml-qdoc-test-child.html#rear-method">rear</a></b>(Child <i>child</i>, var <i>method</i>)</li> +<li class="fn" translate="no">void <b><a href="qml-qdoc-test-child.html#name-method" translate="no">name</a></b>(Child <i>child</i>, <i>name</i>)</li> +<li class="fn" translate="no">void <b><a href="qml-qdoc-test-child.html#name-method-1" translate="no">name</a></b>()</li> +<li class="fn" translate="no">void <b><a href="qml-qdoc-test-child.html#rear-method" translate="no">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="qmlitem"><div class="qmlproto" translate="no"> <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> +<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" translate="no">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="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="name-prop"> <td class="tblQmlPropNode"><p> @@ -64,17 +64,17 @@ <br/> <h2>Method Documentation</h2> <!-- $$$name[overload1]$$$nameChild --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <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> +<span class="type">void</span> <span class="name">name</span>(<span class="type"><a href="qml-qdoc-test-child.html" translate="no">Child</a></span> <i>child</i>, <i>name</i>)</p></td></tr> </table></div></div> <div class="qmldoc"><p>Name a <i translate="no">child</i> of this child using <i translate="no">name</i>.</p> </div></div><!-- @@@name --> <br/> <!-- $$$name$$$name --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="name-method-1"> <td class="tblQmlFuncNode"><p> @@ -84,11 +84,11 @@ </div></div><!-- @@@name --> <br/> <!-- $$$rear[overload1]$$$rearChildvar --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <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> +<span class="type">void</span> <span class="name">rear</span>(<span class="type"><a href="qml-qdoc-test-child.html" translate="no">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 translate="no">child</i> using a specific <i translate="no">method</i>.</p> </div></div><!-- @@@rear --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-doctest.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-doctest.html index 133e8757f..cc9aa4ecf 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-doctest.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-doctest.html @@ -6,7 +6,7 @@ <title>DocTest QML Type | Test</title> </head> <body> -<li><a href="qdoc-test-qmlmodule.html">Types</a></li> +<li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li> <li>DocTest</li> <div class="sidebar"> <div class="toc"> @@ -30,19 +30,19 @@ </ul> <h2 id="properties">Properties</h2> <ul> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-doctest.html#active-prop">active</a></b> : bool</li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-doctest.html#name-prop">name</a></b> : string</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-doctest.html#active-prop" translate="no">active</a></b> : bool</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-doctest.html#name-prop" translate="no">name</a></b> : string</li> </ul> <h2 id="signals">Signals</h2> <ul> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-doctest.html#completed-signal">completed</a></b>()</li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-doctest.html#foo-signal">foo</a></b>(var <i>bar</i>)</li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-doctest.html#itsHappening-signal">itsHappening</a></b>(bool <i>really</i>)</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-doctest.html#completed-signal" translate="no">completed</a></b>()</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-doctest.html#foo-signal" translate="no">foo</a></b>(var <i>bar</i>)</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-doctest.html#itsHappening-signal" translate="no">itsHappening</a></b>(bool <i>really</i>)</li> </ul> <h2 id="methods">Methods</h2> <ul> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-doctest.html#fail-method">fail</a></b>(<i>message</i>)</li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-doctest.html#fail_hard-method">fail_hard</a></b>(<i>msg</i>, <i>option</i>)</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-doctest.html#fail-method" translate="no">fail</a></b>(<i>message</i>)</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-doctest.html#fail_hard-method" translate="no">fail_hard</a></b>(<i>msg</i>, <i>option</i>)</li> </ul> <!-- $$$DocTest-description --> <h2 id="details">Detailed Description</h2> @@ -51,25 +51,25 @@ <!-- @@@DocTest --> <h2>Property Documentation</h2> <!-- $$$active --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <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> +<p><b>See also </b><a href="qml-qdoc-test-doctest.html#name-prop" translate="no">name</a>.</p> </div></div><!-- @@@active --> <br/> <!-- $$$name --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <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" translate="no"><span class="type"><a href="qml-qdoc-test-doctest.html">DocTest</a></span> { +<pre class="qml" translate="no"><span class="type"><a href="qml-qdoc-test-doctest.html" translate="no">DocTest</a></span> { <span class="name">name</span>: <span class="string">"test"</span> <span class="comment">// ...</span> }</pre> @@ -77,7 +77,7 @@ <br/> <h2>Signal Documentation</h2> <!-- $$$completed[overload1]$$$completed --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="completed-signal"> <td class="tblQmlFuncNode"><p> @@ -87,7 +87,7 @@ </div></div><!-- @@@completed --> <br/> <!-- $$$foo[overload1]$$$foovar --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="foo-signal"> <td class="tblQmlFuncNode"><p> @@ -98,7 +98,7 @@ </div></div><!-- @@@foo --> <br/> <!-- $$$itsHappening[overload1]$$$itsHappeningbool --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="itsHappening-signal"> <td class="tblQmlFuncNode"><p> @@ -110,7 +110,7 @@ <br/> <h2>Method Documentation</h2> <!-- $$$fail[overload1]$$$fail --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="fail-method"> <td class="tblQmlFuncNode"><p> @@ -121,7 +121,7 @@ </div></div><!-- @@@fail --> <br/> <!-- $$$fail_hard[overload1]$$$fail_hard --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="fail_hard-method"> <td class="tblQmlFuncNode"><p> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-members.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-members.html index 71b6ffc3a..b4b039291 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-members.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-members.html @@ -6,30 +6,30 @@ <title>List of All Members for Type | Test</title> </head> <body> -<li><a href="qdoc-test-qmlmodule.html">Types</a></li> +<li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li> <li>Type</li> <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> <h1 class="title" translate="no">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" translate="no"><b><a href="qml-qdoc-test-type.html#fifth-prop">fifth</a></b> : int</li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#fourth-prop">fourth</a></b> : int</li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#group-prop">group</a></b><ul> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#group.first-prop">group.first</a></b> : int</li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#group.second-prop">group.second</a></b> : int</li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#group.third-prop">group.third</a></b> : int</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#fifth-prop" translate="no">fifth</a></b> : int</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#fourth-prop" translate="no">fourth</a></b> : int</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#group-prop" translate="no">group</a></b><ul> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#group.first-prop" translate="no">group.first</a></b> : int</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#group.second-prop" translate="no">group.second</a></b> : int</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#group.third-prop" translate="no">group.third</a></b> : int</li> </ul> </li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#id-prop">id</a></b> : int</li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#name-prop">name</a></b> : string</li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#type-attached-prop">type</a></b> : enumeration [attached]</li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#completed-signal">completed</a></b>(int <i>status</i>)</li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#configured-signal">configured</a></b>() [attached]</li> -<li class="fn" translate="no">Type <b><a href="qml-qdoc-test-type.html#copy-method">copy</a></b>(<i>a</i>)</li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-type-obsolete.html#deprecatedMethod-method">deprecatedMethod</a></b>()<code> (deprecated since 6.2)</code></li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#disable-method">disable</a></b>()</li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#enable-method">enable</a></b>()</li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#group.created-signal">group.created</a></b>()</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#id-prop" translate="no">id</a></b> : int</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#name-prop" translate="no">name</a></b> : string</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#type-attached-prop" translate="no">type</a></b> : enumeration [attached]</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#completed-signal" translate="no">completed</a></b>(int <i>status</i>)</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#configured-signal" translate="no">configured</a></b>() [attached]</li> +<li class="fn" translate="no">Type <b><a href="qml-qdoc-test-type.html#copy-method" translate="no">copy</a></b>(<i>a</i>)</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type-obsolete.html#deprecatedMethod-method" translate="no">deprecatedMethod</a></b>()<code> (deprecated since 6.2)</code></li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#disable-method" translate="no">disable</a></b>()</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#enable-method" translate="no">enable</a></b>()</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#group.created-signal" translate="no">group.created</a></b>()</li> </ul> </body> </html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-obsolete.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-obsolete.html index 8a2e64fe5..1b196d99e 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-obsolete.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-obsolete.html @@ -6,18 +6,18 @@ <title>Obsolete Members for Type | Test</title> </head> <body> -<li><a href="qdoc-test-qmlmodule.html">Types</a></li> +<li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li> <li>Type</li> <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> <h1 class="title" translate="no">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" translate="no"><b><a href="qml-qdoc-test-type-obsolete.html#deprecatedMethod-method">deprecatedMethod</a></b>()<code> (deprecated since 6.2)</code></li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type-obsolete.html#deprecatedMethod-method" translate="no">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="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="deprecatedMethod-method"> <td class="tblQmlFuncNode"><p> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html index 436327222..7615b3661 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html @@ -6,7 +6,7 @@ <title>Type QML Type | Test</title> </head> <body> -<li><a href="qdoc-test-qmlmodule.html">Types</a></li> +<li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li> <li>Type</li> <div class="sidebar"> <div class="toc"> @@ -26,41 +26,41 @@ <p>A QML type documented in a .cpp file. <a href="#details">More...</a></p> <!-- @@@Type --> <div class="table"><table class="alignedsummary" translate="no"> -<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"> Qt 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> +<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"> Qt 1.1</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Instantiates:</td><td class="memItemRight bottomAlign"> <a href="testqdoc-test.html" translate="no">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" translate="no"><b><a href="qml-qdoc-test-type.html#fifth-prop">fifth</a></b> : int</li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#fourth-prop">fourth</a></b> : int</li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#group-prop">group</a></b><ul> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#group.first-prop">group.first</a></b> : int</li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#group.second-prop">group.second</a></b> : int</li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#group.third-prop">group.third</a></b> : int</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#fifth-prop" translate="no">fifth</a></b> : int</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#fourth-prop" translate="no">fourth</a></b> : int</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#group-prop" translate="no">group</a></b><ul> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#group.first-prop" translate="no">group.first</a></b> : int</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#group.second-prop" translate="no">group.second</a></b> : int</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#group.third-prop" translate="no">group.third</a></b> : int</li> </ul> </li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#id-prop">id</a></b> : int</li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#name-prop">name</a></b> : string</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#id-prop" translate="no">id</a></b> : int</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#name-prop" translate="no">name</a></b> : string</li> </ul> <h2 id="attached-properties">Attached Properties</h2> <ul> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#type-attached-prop">type</a></b> : enumeration</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#type-attached-prop" translate="no">type</a></b> : enumeration</li> </ul> <h2 id="signals">Signals</h2> <ul> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#completed-signal">completed</a></b>(int <i>status</i>)</li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#group.created-signal">group.created</a></b>()</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#completed-signal" translate="no">completed</a></b>(int <i>status</i>)</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#group.created-signal" translate="no">group.created</a></b>()</li> </ul> <h2 id="attached-signals">Attached Signals</h2> <ul> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#configured-signal">configured</a></b>()</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#configured-signal" translate="no">configured</a></b>()</li> </ul> <h2 id="methods">Methods</h2> <ul> -<li class="fn" translate="no">Type <b><a href="qml-qdoc-test-type.html#copy-method">copy</a></b>(<i>a</i>)</li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#disable-method">disable</a></b>()</li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#enable-method">enable</a></b>()</li> +<li class="fn" translate="no">Type <b><a href="qml-qdoc-test-type.html#copy-method" translate="no">copy</a></b>(<i>a</i>)</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#disable-method" translate="no">disable</a></b>()</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-type.html#enable-method" translate="no">enable</a></b>()</li> </ul> <!-- $$$Type-description --> <h2 id="details">Detailed Description</h2> @@ -68,47 +68,47 @@ <h2>Property Documentation</h2> <!-- $$$ --> <div class="qmlitem"><div class="fngroup"> -<div class="qmlproto"> +<div class="qmlproto" translate="no"> <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> +<span class="name">fifth</span> : <span class="type"><a href="qml-int.html" translate="no">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> +<span class="name">fourth</span> : <span class="type"><a href="qml-int.html" translate="no">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="qmlitem"><div class="qmlproto" translate="no"> <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> +<span class="name">group.first</span> : <span class="type"><a href="qml-int.html" translate="no">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> +<span class="name">group.second</span> : <span class="type"><a href="qml-int.html" translate="no">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> +<span class="name">group.third</span> : <span class="type"><a href="qml-int.html" translate="no">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="qmlitem"><div class="qmlproto" translate="no"> <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> +<span class="qmlextra">[read-only] </span><span class="name">id</span> : <span class="type"><a href="qml-int.html" translate="no">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="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="name-prop"> <td class="tblQmlPropNode"><p> @@ -119,7 +119,7 @@ <br/> <h2>Attached Property Documentation</h2> <!-- $$$type --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="type-attached-prop"> <td class="tblQmlPropNode"><p> @@ -133,18 +133,18 @@ <br/> <h2>Signal Documentation</h2> <!-- $$$completed[overload1]$$$completedint --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <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> +<span class="name">completed</span>(<span class="type"><a href="qml-int.html" translate="no">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 translate="no">status</i>.</p> <p><b>Note: </b>The corresponding handler is <code translate="no">onCompleted</code>.</p> </div></div><!-- @@@completed --> <br/> <!-- $$$group.created[overload1]$$$group.created --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="group.created-signal"> <td class="tblQmlFuncNode"><p> @@ -156,7 +156,7 @@ <br/> <h2>Attached Signal Documentation</h2> <!-- $$$configured[overload1]$$$configured --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="configured-signal"> <td class="tblQmlFuncNode"><p> @@ -169,7 +169,7 @@ <h2>Method Documentation</h2> <!-- $$$ --> <div class="qmlitem"><div class="fngroup"> -<div class="qmlproto"> +<div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="disable-method"> <td class="tblQmlFuncNode"><p> @@ -182,11 +182,11 @@ </div></div><!-- @@@ --> <br/> <!-- $$$copy[overload1]$$$copy --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <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> +<span class="type"><a href="qml-qdoc-test-type.html" translate="no">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 translate="no">a</i>.</p> </div></div><!-- @@@copy --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-yetanotherchild.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-yetanotherchild.html index 16ea08485..f7bb76841 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-yetanotherchild.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-yetanotherchild.html @@ -6,7 +6,7 @@ <title>YetAnotherChild QML Type | Test</title> </head> <body> -<li><a href="qdoc-test-qmlmodule.html">Types</a></li> +<li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li> <li>YetAnotherChild</li> <div class="sidebar"> <div class="toc"> @@ -27,18 +27,18 @@ </ul> <h2 id="properties">Properties</h2> <ul> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-yetanotherchild.html#prop-prop">prop</a></b> : int</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-yetanotherchild.html#prop-prop" translate="no">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="qmlitem"><div class="qmlproto" translate="no"> <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> +<span class="name">prop</span> : <span class="type"><a href="qml-int.html" translate="no">int</a></span></p></td></tr> </table></div></div> <div class="qmldoc"><p>Propagated to inheriting type docs.</p> </div></div><!-- @@@prop --> 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 index fc2e5011b..fd510a6a8 100644 --- 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 @@ -6,8 +6,8 @@ <title>List of All Members for TypeNoVersion | Test</title> </head> <body> -<li><a href="qdoc-test-qmlmodule.html">Types</a></li> -<li><a href="test-nover-qmlmodule.html">Test.NoVer (Tech Preview)</a></li> +<li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li> +<li><a href="test-nover-qmlmodule.html" translate="no">Test.NoVer (Tech Preview)</a></li> <li>TypeNoVersion</li> <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> <h1 class="title" translate="no">List of All Members for TypeNoVersion</h1> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-test-nover-typenoversion.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-test-nover-typenoversion.html index 7356fe45c..9b388cd73 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-test-nover-typenoversion.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-test-nover-typenoversion.html @@ -6,8 +6,8 @@ <title>TypeNoVersion QML Type | Test</title> </head> <body> -<li><a href="qdoc-test-qmlmodule.html">Types</a></li> -<li><a href="test-nover-qmlmodule.html">Test.NoVer (Tech Preview)</a></li> +<li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li> +<li><a href="test-nover-qmlmodule.html" translate="no">Test.NoVer (Tech Preview)</a></li> <li>TypeNoVersion</li> <div class="sidebar"> <div class="toc"> @@ -22,7 +22,7 @@ <p>Another QML type documented in a .cpp file. <a href="#details">More...</a></p> <!-- @@@TypeNoVersion --> <div class="table"><table class="alignedsummary" translate="no"> -<tr><td class="memItemLeft rightAlign topAlign"> Import Statement:</td><td class="memItemRight bottomAlign"> import Test.NoVer</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Since:</td><td class="memItemRight bottomAlign"> Qt 1.1</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> +<tr><td class="memItemLeft rightAlign topAlign"> Import Statement:</td><td class="memItemRight bottomAlign"> import Test.NoVer</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Since:</td><td class="memItemRight bottomAlign"> Qt 1.1</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Instantiates:</td><td class="memItemRight bottomAlign"> <a href="testqdoc-testderived.html" translate="no">TestDerived</a></td></tr></table></div><ul> <li><a href="qml-test-nover-typenoversion-members.html">List of all members, including inherited members</a></li> </ul> <!-- $$$TypeNoVersion-description --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html index 3d9a60f2f..96931039f 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html @@ -6,8 +6,8 @@ <title>ProgressBar QML Type | Test</title> </head> <body> -<li><a href="qdoc-test-qmlmodule.html">Types</a></li> -<li><a href="uicomponents-qmlmodule.html">UIComponents</a></li> +<li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li> +<li><a href="uicomponents-qmlmodule.html" translate="no">UIComponents</a></li> <li>ProgressBar</li> <div class="sidebar"> <div class="toc"> @@ -28,67 +28,67 @@ </ul> <h2 id="properties">Properties</h2> <ul> -<li class="fn" translate="no"><b><a href="qml-uicomponents-progressbar.html#color-prop">color</a></b> : color</li> -<li class="fn" translate="no"><b><a href="qml-uicomponents-progressbar.html#maximum-prop">maximum</a></b> : int</li> -<li class="fn" translate="no"><b><a href="qml-uicomponents-progressbar.html#minimum-prop">minimum</a></b> : int</li> -<li class="fn" translate="no"><b><a href="qml-uicomponents-progressbar.html#secondColor-prop">secondColor</a></b> : color</li> -<li class="fn" translate="no"><b><a href="qml-uicomponents-progressbar.html#value-prop">value</a></b> : int</li> +<li class="fn" translate="no"><b><a href="qml-uicomponents-progressbar.html#color-prop" translate="no">color</a></b> : color</li> +<li class="fn" translate="no"><b><a href="qml-uicomponents-progressbar.html#maximum-prop" translate="no">maximum</a></b> : int</li> +<li class="fn" translate="no"><b><a href="qml-uicomponents-progressbar.html#minimum-prop" translate="no">minimum</a></b> : int</li> +<li class="fn" translate="no"><b><a href="qml-uicomponents-progressbar.html#secondColor-prop" translate="no">secondColor</a></b> : color</li> +<li class="fn" translate="no"><b><a href="qml-uicomponents-progressbar.html#value-prop" translate="no">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> +<p>A ProgressBar shows the linear progress of an event as its <a href="qml-uicomponents-progressbar.html#value-prop" translate="no">value</a>. The range is specified using the <a href="qml-uicomponents-progressbar.html#minimum-prop" translate="no">minimum</a> and the <a href="qml-uicomponents-progressbar.html#maximum-prop" translate="no">maximum</a> values.</p> +<p>The ProgressBar component is part of the <a href="uicomponents-qmlmodule.html" translate="no">UI Components</a> module.</p> +<p>This documentation is part of the <a href="test-componentset-example.html" translate="no">UIComponents</a> example.</p> <!-- @@@ProgressBar --> <h2>Property Documentation</h2> <!-- $$$color --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <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 class="qmldoc"><p>The color of the <a href="qml-uicomponents-progressbar.html" translate="no">ProgressBar</a>'s gradient. Must bind to a color type.</p> +<p><b>See also </b><a href="qml-uicomponents-progressbar.html#secondColor-prop" translate="no">secondColor</a>.</p> </div></div><!-- @@@color --> <br/> <!-- $$$maximum --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <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> +<span class="name">maximum</span> : <span class="type"><a href="qml-int.html" translate="no">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 class="qmldoc"><p>The maximum value of the <a href="qml-uicomponents-progressbar.html" translate="no">ProgressBar</a> range. The <a href="qml-uicomponents-progressbar.html#value-prop" translate="no">value</a> must not be more than this value.</p> </div></div><!-- @@@maximum --> <br/> <!-- $$$minimum --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <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> +<span class="name">minimum</span> : <span class="type"><a href="qml-int.html" translate="no">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 class="qmldoc"><p>The minimum value of the <a href="qml-uicomponents-progressbar.html" translate="no">ProgressBar</a> range. The <a href="qml-uicomponents-progressbar.html#value-prop" translate="no">value</a> must not be less than this value.</p> </div></div><!-- @@@minimum --> <br/> <!-- $$$secondColor --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <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 class="qmldoc"><p>The second color of the <a href="qml-uicomponents-progressbar.html" translate="no">ProgressBar</a>'s gradient. Must bind to a color type.</p> +<p><b>See also </b><a href="qml-uicomponents-progressbar.html#color-prop" translate="no">color</a>.</p> </div></div><!-- @@@secondColor --> <br/> <!-- $$$value --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <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> +<span class="name">value</span> : <span class="type"><a href="qml-int.html" translate="no">int</a></span></p></td></tr> </table></div></div> <div class="qmldoc"><p>The value of the progress.</p> </div></div><!-- @@@value --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html index 85968a3bc..183a3c571 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html @@ -6,8 +6,8 @@ <title>Switch QML Type | Test</title> </head> <body> -<li><a href="qdoc-test-qmlmodule.html">Types</a></li> -<li><a href="uicomponents-qmlmodule.html">UIComponents</a></li> +<li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li> +<li><a href="uicomponents-qmlmodule.html" translate="no">UIComponents</a></li> <li>Switch</li> <div class="sidebar"> <div class="toc"> @@ -29,21 +29,21 @@ </ul> <h2 id="properties">Properties</h2> <ul> -<li class="fn" translate="no"><b><a href="qml-uicomponents-switch.html#on-prop">on</a></b> : bool</li> +<li class="fn" translate="no"><b><a href="qml-uicomponents-switch.html#on-prop" translate="no">on</a></b> : bool</li> </ul> <h2 id="methods">Methods</h2> <ul> -<li class="fn" translate="no"><b><a href="qml-uicomponents-switch.html#toggle-method">toggle</a></b>()</li> +<li class="fn" translate="no"><b><a href="qml-uicomponents-switch.html#toggle-method" translate="no">toggle</a></b>()</li> </ul> <!-- $$$Switch-description --> <h2 id="details">Detailed Description</h2> -<p>A toggle switch has two states: an <code translate="no">on</code> and an <code translate="no">off</code> state. The <code translate="no">off</code> state is when the <a href="qml-uicomponents-switch.html#on-prop">on</a> property is set to <code translate="no">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> +<p>A toggle switch has two states: an <code translate="no">on</code> and an <code translate="no">off</code> state. The <code translate="no">off</code> state is when the <a href="qml-uicomponents-switch.html#on-prop" translate="no">on</a> property is set to <code translate="no">false</code>.</p> +<p>The ToggleSwitch component is part of the <a href="uicomponents-qmlmodule.html" translate="no">UI Components</a> module.</p> +<p>This documentation is part of the <a href="test-componentset-example.html" translate="no">UIComponents</a> example.</p> <!-- @@@Switch --> <h2>Property Documentation</h2> <!-- $$$on --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="on-prop"> <td class="tblQmlPropNode"><p> @@ -54,7 +54,7 @@ <br/> <h2>Method Documentation</h2> <!-- $$$toggle[overload1]$$$toggle --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="toggle-method"> <td class="tblQmlFuncNode"><p> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html index 3d219d40d..043e1fdd5 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html @@ -6,8 +6,8 @@ <title>TabWidget QML Type | Test</title> </head> <body> -<li><a href="qdoc-test-qmlmodule.html">Types</a></li> -<li><a href="uicomponents-qmlmodule.html">UIComponents</a></li> +<li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li> +<li><a href="uicomponents-qmlmodule.html" translate="no">UIComponents</a></li> <li>TabWidget</li> <div class="sidebar"> <div class="toc"> @@ -29,17 +29,17 @@ </ul> <h2 id="properties">Properties</h2> <ul> -<li class="fn" translate="no"><b><a href="qml-uicomponents-tabwidget.html#current-prop">current</a></b> : int</li> -<li class="fn" translate="no"><b><a href="qml-uicomponents-tabwidget.html#sampleReadOnlyProperty-prop">sampleReadOnlyProperty</a></b> : int</li> +<li class="fn" translate="no"><b><a href="qml-uicomponents-tabwidget.html#current-prop" translate="no">current</a></b> : int</li> +<li class="fn" translate="no"><b><a href="qml-uicomponents-tabwidget.html#sampleReadOnlyProperty-prop" translate="no">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> +<p>The TabWidget component is part of the <a href="uicomponents-qmlmodule.html" translate="no">UI Components</a> module.</p> +<p>This documentation is part of the <a href="test-componentset-example.html" translate="no">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" translate="no"><span class="type"><a href="qml-uicomponents-tabwidget.html">TabWidget</a></span> { +<pre class="cpp" translate="no"><span class="type"><a href="qml-uicomponents-tabwidget.html" translate="no">TabWidget</a></span> { <span class="name">id</span>: <span class="name">tabwidget</span> <span class="type">Rectangle</span> { @@ -57,25 +57,25 @@ <!-- @@@TabWidget --> <h2>Property Documentation</h2> <!-- $$$current --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <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> +<span class="name">current</span> : <span class="type"><a href="qml-int.html" translate="no">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 class="qmldoc"><p>The currently active tab in the <a href="qml-uicomponents-tabwidget.html" translate="no">TabWidget</a>.</p> </div></div><!-- @@@current --> <br/> <!-- $$$sampleReadOnlyProperty --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <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> +<span class="qmlextra">[read-only] </span><span class="name">sampleReadOnlyProperty</span> : <span class="type"><a href="qml-int.html" translate="no">int</a></span></p></td></tr> </table></div></div> <div class="qmldoc"><p>A sample <code translate="no">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" translate="no">readonly property <span class="type"><a href="qml-int.html">int</a></span> sampleReadOnlyProperty: <span class="number">0</span></pre> +<pre class="cpp" translate="no">readonly property <span class="type"><a href="qml-int.html" translate="no">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/> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qmlmodules.html b/tests/auto/qdoc/generatedoutput/expected_output/qmlmodules.html index c45ae07e9..3f1a3e78c 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qmlmodules.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qmlmodules.html @@ -11,10 +11,10 @@ <!-- $$$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> +<tr class="odd topAlign"><td class="tblName" translate="no"><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" translate="no"><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" translate="no"><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" translate="no"><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 --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-anotherchild-members.html b/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-anotherchild-members.html index 4ebcc50f6..1188ef72d 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-anotherchild-members.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-anotherchild-members.html @@ -6,20 +6,20 @@ <title>List of All Members for AnotherChild | QmlPropertyGroups</title> </head> <body> -<li><a href="qdoc-test-qmlmodule.html">Types</a></li> +<li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li> <li>AnotherChild</li> <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> <h1 class="title" translate="no">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" translate="no"><b><a href="qml-qdoc-test-anotherchild.html#name-prop">name</a></b> : string</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-anotherchild.html#name-prop" translate="no">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" translate="no"><b><a href="qml-qdoc-test-parent.html#group-prop">group</a></b><ul> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-parent.html#group.a-prop">group.a</a></b> : int</li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-parent.html#group.b-prop">group.b</a></b> : int</li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-parent.html#group.c-prop">group.c</a></b> : int</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-parent.html#group-prop" translate="no">group</a></b><ul> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-parent.html#group.a-prop" translate="no">group.a</a></b> : int</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-parent.html#group.b-prop" translate="no">group.b</a></b> : int</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-parent.html#group.c-prop" translate="no">group.c</a></b> : int</li> </ul> </li> </ul> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-parent.html b/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-parent.html index 2be3e0155..744fc15db 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-parent.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-parent.html @@ -6,7 +6,7 @@ <title>Parent QML Type | QmlPropertyGroups</title> </head> <body> -<li><a href="qdoc-test-qmlmodule.html">Types</a></li> +<li><a href="qdoc-test-qmlmodule.html" translate="no">Types</a></li> <li>Parent</li> <div class="sidebar"> <div class="toc"> @@ -22,16 +22,16 @@ <p>Base QML type. <a href="#details">More...</a></p> <!-- @@@Parent --> <div class="table"><table class="alignedsummary" translate="no"> -<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"> Qt 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> +<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"> Qt 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" translate="no">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" translate="no"><b><a href="qml-qdoc-test-parent.html#group-prop">group</a></b><ul> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-parent.html#group.a-prop">group.a</a></b> : int</li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-parent.html#group.b-prop">group.b</a></b> : int</li> -<li class="fn" translate="no"><b><a href="qml-qdoc-test-parent.html#group.c-prop">group.c</a></b> : int</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-parent.html#group-prop" translate="no">group</a></b><ul> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-parent.html#group.a-prop" translate="no">group.a</a></b> : int</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-parent.html#group.b-prop" translate="no">group.b</a></b> : int</li> +<li class="fn" translate="no"><b><a href="qml-qdoc-test-parent.html#group.c-prop" translate="no">group.c</a></b> : int</li> </ul> </li> </ul> @@ -40,18 +40,18 @@ <!-- @@@Parent --> <h2>Property Documentation</h2> <!-- $$$group --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <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> +<span class="name">group.a</span> : <span class="type"><a href="qml-int.html" translate="no">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> +<span class="qmlextra">[read-only] </span><span class="name">group.b</span> : <span class="type"><a href="qml-int.html" translate="no">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> +<span class="qmlextra">[since 2.0] </span><span class="name">group.c</span> : <span class="type"><a href="qml-int.html" translate="no">int</a></span></p></td></tr> </table></div></div> <div class="qmldoc"><p>Property group.</p> </div></div><!-- @@@group --> 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 index a663df7ab..c6229dac2 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/scoped-enum-linking.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/scoped-enum-linking.html @@ -10,8 +10,8 @@ <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> +<p>Linking to <a href="testqdoc-test.html#ScopedEnum-enum" translate="no">All</a>.</p> +<p>TestQDoc::Test::ClassicEnum::Howdy does not link, but <a href="testqdoc-test.html#ClassicEnum-enum" translate="no">TestQDoc::Test::Howdy</a> might.</p> </div> <!-- @@@scoped-enum-linking.html --> </body> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html b/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html index 7bf8f60c0..4cbd2ec19 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html @@ -6,7 +6,7 @@ <title>Test Class | TestCPP</title> </head> <body> -<li><a href="testcpp-module.html">C++ Classes</a></li> +<li><a href="testcpp-module.html" translate="no">C++ Classes</a></li> <li>Test</li> <div class="sidebar"> <div class="toc"> @@ -22,7 +22,7 @@ </div> <div class="sidebar-content" id="sidebar-content"></div></div> <h1 class="title" translate="no">Test Class</h1> -<span class="small-subtitle" translate="no">class <a href="testqdoc.html">TestQDoc</a>::Test</span> +<span class="small-subtitle" translate="no">class <a href="testqdoc.html" translate="no">TestQDoc</a>::Test</span> <!-- $$$Test-brief --> <p>A class in a namespace. <a href="#details">More...</a></p> <!-- @@@Test --> @@ -32,7 +32,7 @@ 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"> Since:</td><td class="memItemRight bottomAlign"> Qt 2.0</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> +<tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html" translate="no">TestQDoc::TestDerived</a></p> </td></tr> </table></div> <ul> @@ -42,34 +42,34 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> </ul> <h2 id="public-types">Public Types</h2> <div class="table"><table class="alignedsummary" translate="no"> -<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> +<tr><td class="memItemLeft rightAlign topAlign"> enum </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#ClassicEnum-enum" translate="no">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" translate="no">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" translate="no">SomeType</a></b></td></tr> </table></div> <h2 id="public-functions">Public Functions</h2> <div class="table"><table class="alignedsummary" translate="no"> -<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"> 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"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#methodWithEmDashInItsDocs">methodWithEmDashInItsDocs</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#methodWithEnDashInItsDocs">methodWithEnDashInItsDocs</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> -<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"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#Test" translate="no">Test</a></b>()</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> void (*)(bool) </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#funcPtr" translate="no">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" translate="no">inlineFunction</a></b>()</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#methodWithEmDashInItsDocs" translate="no">methodWithEmDashInItsDocs</a></b>()</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#methodWithEnDashInItsDocs" translate="no">methodWithEnDashInItsDocs</a></b>()</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> int </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunction" translate="no">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" translate="no">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" translate="no">virtualFun</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" translate="no">operator=</a></b>(TestQDoc::Test &&<i>other</i>)</td></tr> </table></div> <h2 id="protected-functions">Protected Functions</h2> <div class="table"><table class="alignedsummary" translate="no"> -<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> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#overload" translate="no">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" translate="no">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" translate="no"> -<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> +<tr><td class="memItemLeft rightAlign topAlign"> bool </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#operator-eq-eq" translate="no">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" translate="no"> -<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#QDOCTEST_MACRO2" translate="no">QDOCTEST_MACRO2</a></b>(int &<i>x</i>)</td></tr> </table></div> <!-- $$$Test-description --> <div class="descr"> @@ -126,7 +126,7 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> <p>-----------------------------------------------------------------------</p> <p>People can still add a bunch of dashes, though, without QDoc replacing them all with a series of em dashes.</p> <p>—You can also start a new paragraph with an em dash, if you want to.</p> -<p><b>See also </b><a href="testqdoc-test.html#methodWithEnDashInItsDocs">methodWithEnDashInItsDocs</a>.</p> +<p><b>See also </b><a href="testqdoc-test.html#methodWithEnDashInItsDocs" translate="no">methodWithEnDashInItsDocs</a>.</p> <!-- @@@methodWithEmDashInItsDocs --> <!-- $$$methodWithEnDashInItsDocs[overload1]$$$methodWithEnDashInItsDocs --> <h3 class="fn" translate="no" id="methodWithEnDashInItsDocs"><span class="type">void</span> Test::<span class="name">methodWithEnDashInItsDocs</span>()</h3> @@ -153,14 +153,14 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> <p>Function that must be reimplemented.</p> <!-- @@@virtualFun --> <!-- $$$operator=[overload1]$$$operator=TestQDoc::Test&& --> -<h3 class="fn" translate="no" id="operator-eq"><code translate="no">[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> +<h3 class="fn" translate="no" id="operator-eq"><code translate="no">[default] </code><span class="type"><a href="testqdoc-test.html" translate="no">TestQDoc::Test</a></span> &Test::<span class="name">operator=</span>(<span class="type"><a href="testqdoc-test.html" translate="no">TestQDoc::Test</a></span> &&<i>other</i>)</h3> <p>Move-assigns <i translate="no">other</i>.</p> <!-- @@@operator= --> </div> <div class="relnonmem"> <h2>Related Non-Members</h2> <!-- $$$operator==[overload1]$$$operator==constTestQDoc::Test&constTestQDoc::Test& --> -<h3 class="fn" translate="no" 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> +<h3 class="fn" translate="no" id="operator-eq-eq"><span class="type">bool</span> <span class="name">operator==</span>(const <span class="type"><a href="testqdoc-test.html" translate="no">TestQDoc::Test</a></span> &<i>lhs</i>, const <span class="type"><a href="testqdoc-test.html" translate="no">TestQDoc::Test</a></span> &<i>rhs</i>)</h3> <p>Returns true if <i translate="no">lhs</i> and <i translate="no">rhs</i> are equal.</p> <!-- @@@operator== --> </div> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/space.html b/tests/auto/qdoc/generatedoutput/expected_output/space.html index e8f81b9bb..d6adc7cf0 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/space.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/space.html @@ -24,7 +24,7 @@ </table></div> <h2 id="functions">Functions</h2> <div class="table"><table class="alignedsummary" translate="no"> -<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> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="space.html#spaceFun" translate="no">spaceFun</a></b>(Space::spacename <i>space</i>)</td></tr> </table></div> <!-- $$$Space-description --> <div class="descr"> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/bar.html b/tests/auto/qdoc/generatedoutput/expected_output/template/bar.html index aa4208fbb..d5ee765d7 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/template/bar.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/template/bar.html @@ -6,7 +6,7 @@ <title>Bar Class | TestCPP</title> </head> <body> -<li><a href="testcpp-module.html">C++ Classes</a></li> +<li><a href="testcpp-module.html" translate="no">C++ Classes</a></li> <li>Bar</li> <div class="sidebar"> <div class="toc"> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/baz.html b/tests/auto/qdoc/generatedoutput/expected_output/template/baz.html index 6abf6a1dc..3b9048a0f 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/template/baz.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/template/baz.html @@ -6,7 +6,7 @@ <title>Baz Struct | TestCPP</title> </head> <body> -<li><a href="testcpp-module.html">C++ Classes</a></li> +<li><a href="testcpp-module.html" translate="no">C++ Classes</a></li> <li>Baz</li> <div class="sidebar"> <div class="toc"> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/foo.html b/tests/auto/qdoc/generatedoutput/expected_output/template/foo.html index 7b626169f..8f0715b96 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/template/foo.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/template/foo.html @@ -6,7 +6,7 @@ <title>Foo Class | TestCPP</title> </head> <body> -<li><a href="testcpp-module.html">C++ Classes</a></li> +<li><a href="testcpp-module.html" translate="no">C++ Classes</a></li> <li>Foo</li> <div class="sidebar"> <div class="toc"> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test-struct.html b/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test-struct.html index 326e68b9d..245918d0c 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test-struct.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test-struct.html @@ -6,7 +6,7 @@ <title>Struct Struct | TestCPP</title> </head> <body> -<li><a href="testcpp-module.html">C++ Classes</a></li> +<li><a href="testcpp-module.html" translate="no">C++ Classes</a></li> <li>Struct</li> <div class="sidebar"> <div class="toc"> @@ -17,7 +17,7 @@ </div> <div class="sidebar-content" id="sidebar-content"></div></div> <h1 class="title" translate="no">Struct Struct</h1> -<span class="small-subtitle" translate="no">template <typename D, typename T> struct <a href="testqdoc.html">TestQDoc</a>::<a href="testqdoc-test.html">Test</a>::Struct</span> +<span class="small-subtitle" translate="no">template <typename D, typename T> struct <a href="testqdoc.html" translate="no">TestQDoc</a>::<a href="testqdoc-test.html" translate="no">Test</a>::Struct</span> <!-- $$$Struct-brief --> <p>Templated struct. <a href="#details">More...</a></p> <!-- @@@Struct --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test.html b/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test.html index 6a00bf483..47aefcd8b 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test.html @@ -6,7 +6,7 @@ <title>Test Class | TestCPP</title> </head> <body> -<li><a href="testcpp-module.html">C++ Classes</a></li> +<li><a href="testcpp-module.html" translate="no">C++ Classes</a></li> <li>Test</li> <div class="sidebar"> <div class="toc"> @@ -22,7 +22,7 @@ </div> <div class="sidebar-content" id="sidebar-content"></div></div> <h1 class="title" translate="no">Test Class</h1> -<span class="small-subtitle" translate="no">class <a href="testqdoc.html">TestQDoc</a>::Test</span> +<span class="small-subtitle" translate="no">class <a href="testqdoc.html" translate="no">TestQDoc</a>::Test</span> <!-- $$$Test-brief --> <p>A class in a namespace. <a href="#details">More...</a></p> <!-- @@@Test --> @@ -32,7 +32,7 @@ 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"> Since:</td><td class="memItemRight bottomAlign"> Qt 2.0</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> +<tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html" translate="no">TestQDoc::TestDerived</a></p> </td></tr> </table></div> <ul> @@ -42,36 +42,36 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> </ul> <h2 id="public-types">Public Types</h2> <div class="table"><table class="alignedsummary" translate="no"> -<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> +<tr><td class="memItemLeft rightAlign topAlign"> struct </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test-struct.html" translate="no">Struct</a></b></td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#SomeType-typedef" translate="no">SomeType</a></b></td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#Specialized-typedef" translate="no">Specialized</a></b></td></tr> </table></div> <h2 id="public-functions">Public Functions</h2> <div class="table"><table class="alignedsummary" translate="no"> -<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"> 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"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#methodWithEmDashInItsDocs">methodWithEmDashInItsDocs</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#methodWithEnDashInItsDocs">methodWithEnDashInItsDocs</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> -<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"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#Test" translate="no">Test</a></b>()</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> void (*)(bool) </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#funcPtr" translate="no">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" translate="no">inlineFunction</a></b>()</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#methodWithEmDashInItsDocs" translate="no">methodWithEmDashInItsDocs</a></b>()</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#methodWithEnDashInItsDocs" translate="no">methodWithEnDashInItsDocs</a></b>()</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> int </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunction" translate="no">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" translate="no">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" translate="no">virtualFun</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" translate="no">operator=</a></b>(TestQDoc::Test &&<i>other</i>)</td></tr> </table></div> <h2 id="protected-functions">Protected Functions</h2> <div class="table"><table class="alignedsummary" translate="no"> -<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> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#funcTemplate" translate="no">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" translate="no">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" translate="no">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" translate="no"> -<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> +<tr><td class="memItemLeft rightAlign topAlign"> bool </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#operator-eq-eq" translate="no">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" translate="no"> -<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> +<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#QDOCTEST_MACRO2" translate="no">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" translate="no">Q_INVOKABLE</a></b></td></tr> </table></div> <!-- $$$Test-description --> <div class="descr"> @@ -117,7 +117,7 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> <p>-----------------------------------------------------------------------</p> <p>People can still add a bunch of dashes, though, without QDoc replacing them all with a series of em dashes.</p> <p>—You can also start a new paragraph with an em dash, if you want to.</p> -<p><b>See also </b><a href="testqdoc-test.html#methodWithEnDashInItsDocs">methodWithEnDashInItsDocs</a>.</p> +<p><b>See also </b><a href="testqdoc-test.html#methodWithEnDashInItsDocs" translate="no">methodWithEnDashInItsDocs</a>.</p> <!-- @@@methodWithEmDashInItsDocs --> <!-- $$$methodWithEnDashInItsDocs[overload1]$$$methodWithEnDashInItsDocs --> <h3 class="fn" translate="no" id="methodWithEnDashInItsDocs"><span class="type">void</span> Test::<span class="name">methodWithEnDashInItsDocs</span>()</h3> @@ -144,14 +144,14 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> <p>Function that must be reimplemented.</p> <!-- @@@virtualFun --> <!-- $$$operator=[overload1]$$$operator=TestQDoc::Test&& --> -<h3 class="fn" translate="no" id="operator-eq"><code translate="no">[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> +<h3 class="fn" translate="no" id="operator-eq"><code translate="no">[default] </code><span class="type"><a href="testqdoc-test.html" translate="no">TestQDoc::Test</a></span> &Test::<span class="name">operator=</span>(<span class="type"><a href="testqdoc-test.html" translate="no">TestQDoc::Test</a></span> &&<i>other</i>)</h3> <p>Move-assigns <i translate="no">other</i>.</p> <!-- @@@operator= --> </div> <div class="relnonmem"> <h2>Related Non-Members</h2> <!-- $$$operator==[overload1]$$$operator==constTestQDoc::Test&constTestQDoc::Test& --> -<h3 class="fn" translate="no" 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> +<h3 class="fn" translate="no" id="operator-eq-eq"><span class="type">bool</span> <span class="name">operator==</span>(const <span class="type"><a href="testqdoc-test.html" translate="no">TestQDoc::Test</a></span> &<i>lhs</i>, const <span class="type"><a href="testqdoc-test.html" translate="no">TestQDoc::Test</a></span> &<i>rhs</i>)</h3> <p>Returns true if <i translate="no">lhs</i> and <i translate="no">rhs</i> are equal.</p> <!-- @@@operator== --> </div> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-vec.html b/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-vec.html index e20a2fc45..d0529ec81 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-vec.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-vec.html @@ -6,7 +6,7 @@ <title>Vec Class | TestCPP</title> </head> <body> -<li><a href="testcpp-module.html">C++ Classes</a></li> +<li><a href="testcpp-module.html" translate="no">C++ Classes</a></li> <li>Vec</li> <div class="sidebar"> <div class="toc"> @@ -17,7 +17,7 @@ </div> <div class="sidebar-content" id="sidebar-content"></div></div> <h1 class="title" translate="no">Vec Class</h1> -<span class="small-subtitle" translate="no">template <typename T> class <a href="testqdoc.html">TestQDoc</a>::Vec</span> +<span class="small-subtitle" translate="no">template <typename T> class <a href="testqdoc.html" translate="no">TestQDoc</a>::Vec</span> <!-- $$$Vec-brief --> <p>Type alias that has its own reference. <a href="#details">More...</a></p> <!-- @@@Vec --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/test-cmaketest-example.html b/tests/auto/qdoc/generatedoutput/expected_output/test-cmaketest-example.html index e46acb6e5..9beaf4d34 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/test-cmaketest-example.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/test-cmaketest-example.html @@ -12,8 +12,8 @@ <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> +<li><a href="test-cmaketest-cmakelists-txt.html" translate="no">cmaketest/CMakeLists.txt</a></li> +<li><a href="test-cmaketest-main-cpp.html" translate="no">cmaketest/main.cpp</a></li> </ul> </div> <!-- @@@cmaketest --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html b/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html index aa0df80a5..b83694b25 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html @@ -24,9 +24,9 @@ <!-- $$$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> +<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" translate="no">UI Components</a> module.</p> +<p>The uicomponents.qdoc file generates the overview page for the <a href="uicomponents-qmlmodule.html" translate="no">UI Components</a> module page.</p> +<p>The generated documentation is available in the <a href="uicomponents-qmlmodule.html" translate="no">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 translate="no">UIComponents</code> module.</p> <p>QDoc uses the \brief command to place a basic description when listing the types.</p> @@ -42,11 +42,11 @@ An aliased property of type <span class="type">int</span><span class="operator"> <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> +<li><a href="test-componentset-progressbar-qml.html" translate="no">componentset/ProgressBar.qml</a></li> +<li><a href="test-componentset-switch-qml.html" translate="no">componentset/Switch.qml</a></li> +<li><a href="test-componentset-tabwidget-qml.html" translate="no">componentset/TabWidget.qml</a></li> +<li><a href="test-componentset-componentset-pro.html" translate="no">componentset/componentset.pro</a></li> +<li><a href="test-componentset-componentset-qml.html" translate="no">componentset/componentset.qml</a></li> </ul> </div> <!-- @@@componentset --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/test-nover-qmlmodule.html b/tests/auto/qdoc/generatedoutput/expected_output/test-nover-qmlmodule.html index 244c3b9e8..a6ec0f425 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/test-nover-qmlmodule.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/test-nover-qmlmodule.html @@ -15,7 +15,7 @@ </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> +<tr class="odd topAlign"><td class="tblName" translate="no"><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/testcpp-module.html b/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html index 5d89862fc..41619a1d8 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html @@ -25,13 +25,13 @@ <p>This module was introduced in Qt 2.0.</p> <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> +<tr class="odd topAlign"><td class="tblName" translate="no"><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" translate="no"><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> +<tr class="odd topAlign"><td class="tblName" translate="no"><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" translate="no"><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"> @@ -41,13 +41,13 @@ </div> <h3 id="linking-to-function-like-things">Linking to function-like things</h3> <ul> -<li><a href="testqdoc-test.html#someFunctionDefaultArg">someFunctionDefaultArg</a>()</li> -<li><a href="testqdoc-test.html#QDOCTEST_MACRO2">QDOCTEST_MACRO2</a>()</li> -<li><a href="testqdoc-test.html#QDOCTEST_MACRO2">QDOCTEST_MACRO2</a>(int &x)</li> -<li><a href="testcpp-module.html#section">section()</a></li> -<li><a href="testcpp-module.html#section">section() is a section title</a></li> -<li><a href="testqdoc-test.html#Test">open( parenthesis</a></li> -<li><a href="https://en.cppreference.com/w/cpp/utility/move">C++11 added std::move(T&& t)</a></li> +<li><a href="testqdoc-test.html#someFunctionDefaultArg" translate="no">someFunctionDefaultArg</a>()</li> +<li><a href="testqdoc-test.html#QDOCTEST_MACRO2" translate="no">QDOCTEST_MACRO2</a>()</li> +<li><a href="testqdoc-test.html#QDOCTEST_MACRO2" translate="no">QDOCTEST_MACRO2</a>(int &x)</li> +<li><a href="testcpp-module.html#section" translate="no">section()</a></li> +<li><a href="testcpp-module.html#section" translate="no">section() is a section title</a></li> +<li><a href="testqdoc-test.html#Test" translate="no">open( parenthesis</a></li> +<li><a href="https://en.cppreference.com/w/cpp/utility/move" translate="no">C++11 added std::move(T&& t)</a></li> </ul> <h4 id="section">section()</h4> </div> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html index 7bc0bce17..c3886f43e 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html @@ -6,24 +6,24 @@ <title>List of All Members for Test | TestCPP</title> </head> <body> -<li><a href="testcpp-module.html">C++ Classes</a></li> +<li><a href="testcpp-module.html" translate="no">C++ Classes</a></li> <li>Test</li> <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> <h1 class="title" translate="no">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" translate="no"><span class="name"><b><a href="testqdoc-test.html#SomeType-typedef">SomeType</a></b></span></li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#Test">Test</a></b></span>()</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#funcPtr">funcPtr</a></b></span>(bool, const char *) : void (*)(bool)</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#inlineFunction">inlineFunction</a></b></span>()</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#methodWithEmDashInItsDocs">methodWithEmDashInItsDocs</a></b></span>()</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#methodWithEnDashInItsDocs">methodWithEnDashInItsDocs</a></b></span>()</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#overload">overload</a></b></span>()</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#overload-1">overload</a></b></span>(bool)</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#someFunction">someFunction</a></b></span>(int, int) : int</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#someFunctionDefaultArg">someFunctionDefaultArg</a></b></span>(int, bool)</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#virtualFun">virtualFun</a></b></span>()</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#operator-eq">operator=</a></b></span>(TestQDoc::Test &&) : TestQDoc::Test &</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#SomeType-typedef" translate="no">SomeType</a></b></span></li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#Test" translate="no">Test</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#funcPtr" translate="no">funcPtr</a></b></span>(bool, const char *) : void (*)(bool)</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#inlineFunction" translate="no">inlineFunction</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#methodWithEmDashInItsDocs" translate="no">methodWithEmDashInItsDocs</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#methodWithEnDashInItsDocs" translate="no">methodWithEnDashInItsDocs</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#overload" translate="no">overload</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#overload-1" translate="no">overload</a></b></span>(bool)</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#someFunction" translate="no">someFunction</a></b></span>(int, int) : int</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#someFunctionDefaultArg" translate="no">someFunctionDefaultArg</a></b></span>(int, bool)</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#virtualFun" translate="no">virtualFun</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#operator-eq" translate="no">operator=</a></b></span>(TestQDoc::Test &&) : TestQDoc::Test &</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 index 93b751f72..993ff93d9 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-obsolete.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-obsolete.html @@ -6,39 +6,39 @@ <title>Obsolete Members for Test | TestCPP</title> </head> <body> -<li><a href="testcpp-module.html">C++ Classes</a></li> +<li><a href="testcpp-module.html" translate="no">C++ Classes</a></li> <li>Test</li> <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> <h1 class="title" translate="no">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> +<p><b>The following members of class <a href="testqdoc-test.html" translate="no">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" translate="no"> -<tr><td class="memItemLeft topAlign rightAlign"> <code translate="no">(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 translate="no">(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 translate="no">(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 translate="no">(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 translate="no">(deprecated) </code>TestQDoc::Test &</td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test-obsolete.html#operator--">operator--</a></b>()</td></tr> +<tr><td class="memItemLeft topAlign rightAlign"> <code translate="no">(deprecated) </code>void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test-obsolete.html#anotherObsoleteMember" translate="no">anotherObsoleteMember</a></b>()</td></tr> +<tr><td class="memItemLeft topAlign rightAlign"> <code translate="no">(deprecated (6.0)) </code>void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test-obsolete.html#deprecatedMember" translate="no">deprecatedMember</a></b>()</td></tr> +<tr><td class="memItemLeft topAlign rightAlign"> <code translate="no">(deprecated) </code>void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test-obsolete.html#obsoleteMember" translate="no">obsoleteMember</a></b>()</td></tr> +<tr><td class="memItemLeft topAlign rightAlign"> <code translate="no">(deprecated) </code>TestQDoc::Test &</td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test-obsolete.html#operator-2b-2b" translate="no">operator++</a></b>()</td></tr> +<tr><td class="memItemLeft topAlign rightAlign"> <code translate="no">(deprecated) </code>TestQDoc::Test &</td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test-obsolete.html#operator--" translate="no">operator--</a></b>()</td></tr> </table></div> <h2>Member Function Documentation</h2> <!-- $$$ --> <div class="fngroup"> -<h3 class="fn fngroupitem" translate="no" 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" translate="no" id="operator--"><span class="type"><a href="testqdoc-test.html">TestQDoc::Test</a></span> &Test::<span class="name">operator--</span>()</h3></div> +<h3 class="fn fngroupitem" translate="no" id="operator-2b-2b"><span class="type"><a href="testqdoc-test.html" translate="no">TestQDoc::Test</a></span> &Test::<span class="name">operator++</span>()</h3><h3 class="fn fngroupitem" translate="no" id="operator--"><span class="type"><a href="testqdoc-test.html" translate="no">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" translate="no" 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> +<p>Use <a href="testqdoc-test-obsolete.html#obsoleteMember" translate="no">obsoleteMember</a>() instead.</p> <!-- @@@anotherObsoleteMember --> <!-- $$$deprecatedMember[overload1]$$$deprecatedMember --> <h3 class="fn" translate="no" 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> +<p>Use <a href="testqdoc-test.html#someFunction" translate="no">someFunction</a>() instead.</p> <!-- @@@deprecatedMember --> <!-- $$$obsoleteMember[overload1]$$$obsoleteMember --> <h3 class="fn" translate="no" 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> +<p>Use <a href="testqdoc-test.html#someFunction" translate="no">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 index 2ba3710a0..50fa5f8ff 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html @@ -6,7 +6,7 @@ <title>Test Class | TestCPP</title> </head> <body> -<li><a href="testcpp-module.html">C++ Classes</a></li> +<li><a href="testcpp-module.html" translate="no">C++ Classes</a></li> <li>Test</li> <div class="sidebar"> <div class="toc"> @@ -22,7 +22,7 @@ </div> <div class="sidebar-content" id="sidebar-content"></div></div> <h1 class="title" translate="no">Test Class</h1> -<span class="small-subtitle" translate="no">class <a href="testqdoc.html">TestQDoc</a>::Test</span> +<span class="small-subtitle" translate="no">class <a href="testqdoc.html" translate="no">TestQDoc</a>::Test</span> <!-- $$$Test-brief --> <p>A class in a namespace. <a href="#details">More...</a></p> <!-- @@@Test --> @@ -32,7 +32,7 @@ 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"> Since:</td><td class="memItemRight bottomAlign"> Qt 2.0</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> +<tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html" translate="no">TestQDoc::TestDerived</a></p> </td></tr> </table></div> <ul> @@ -42,32 +42,32 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> </ul> <h2 id="public-types">Public Types</h2> <div class="table"><table class="alignedsummary" translate="no"> -<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#SomeType-typedef" translate="no">SomeType</a></b></td></tr> </table></div> <h2 id="public-functions">Public Functions</h2> <div class="table"><table class="alignedsummary" translate="no"> -<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"> 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"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#methodWithEmDashInItsDocs">methodWithEmDashInItsDocs</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#methodWithEnDashInItsDocs">methodWithEnDashInItsDocs</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> -<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"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#Test" translate="no">Test</a></b>()</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> void (*)(bool) </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#funcPtr" translate="no">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" translate="no">inlineFunction</a></b>()</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#methodWithEmDashInItsDocs" translate="no">methodWithEmDashInItsDocs</a></b>()</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#methodWithEnDashInItsDocs" translate="no">methodWithEnDashInItsDocs</a></b>()</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> int </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunction" translate="no">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" translate="no">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" translate="no">virtualFun</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" translate="no">operator=</a></b>(TestQDoc::Test &&<i>other</i>)</td></tr> </table></div> <h2 id="protected-functions">Protected Functions</h2> <div class="table"><table class="alignedsummary" translate="no"> -<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> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#overload" translate="no">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" translate="no">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" translate="no"> -<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> +<tr><td class="memItemLeft rightAlign topAlign"> bool </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#operator-eq-eq" translate="no">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" translate="no"> -<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#QDOCTEST_MACRO2" translate="no">QDOCTEST_MACRO2</a></b>(int &<i>x</i>)</td></tr> </table></div> <!-- $$$Test-description --> <div class="descr"> @@ -106,7 +106,7 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> <p>-----------------------------------------------------------------------</p> <p>People can still add a bunch of dashes, though, without QDoc replacing them all with a series of em dashes.</p> <p>—You can also start a new paragraph with an em dash, if you want to.</p> -<p><b>See also </b><a href="testqdoc-test.html#methodWithEnDashInItsDocs">methodWithEnDashInItsDocs</a>.</p> +<p><b>See also </b><a href="testqdoc-test.html#methodWithEnDashInItsDocs" translate="no">methodWithEnDashInItsDocs</a>.</p> <!-- @@@methodWithEmDashInItsDocs --> <!-- $$$methodWithEnDashInItsDocs[overload1]$$$methodWithEnDashInItsDocs --> <h3 class="fn" translate="no" id="methodWithEnDashInItsDocs"><span class="type">void</span> Test::<span class="name">methodWithEnDashInItsDocs</span>()</h3> @@ -133,14 +133,14 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> <p>Function that must be reimplemented.</p> <!-- @@@virtualFun --> <!-- $$$operator=[overload1]$$$operator=TestQDoc::Test&& --> -<h3 class="fn" translate="no" id="operator-eq"><code translate="no">[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> +<h3 class="fn" translate="no" id="operator-eq"><code translate="no">[default] </code><span class="type"><a href="testqdoc-test.html" translate="no">TestQDoc::Test</a></span> &Test::<span class="name">operator=</span>(<span class="type"><a href="testqdoc-test.html" translate="no">TestQDoc::Test</a></span> &&<i>other</i>)</h3> <p>Move-assigns <i translate="no">other</i>.</p> <!-- @@@operator= --> </div> <div class="relnonmem"> <h2>Related Non-Members</h2> <!-- $$$operator==[overload1]$$$operator==constTestQDoc::Test&constTestQDoc::Test& --> -<h3 class="fn" translate="no" 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> +<h3 class="fn" translate="no" id="operator-eq-eq"><span class="type">bool</span> <span class="name">operator==</span>(const <span class="type"><a href="testqdoc-test.html" translate="no">TestQDoc::Test</a></span> &<i>lhs</i>, const <span class="type"><a href="testqdoc-test.html" translate="no">TestQDoc::Test</a></span> &<i>rhs</i>)</h3> <p>Returns true if <i translate="no">lhs</i> and <i translate="no">rhs</i> are equal.</p> <!-- @@@operator== --> </div> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-members.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-members.html index 52f42cc5d..2873c37be 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-members.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-members.html @@ -6,26 +6,26 @@ <title>List of All Members for TestDerived | TestCPP</title> </head> <body> -<li><a href="testcpp-module.html">C++ Classes</a></li> +<li><a href="testcpp-module.html" translate="no">C++ Classes</a></li> <li>TestDerived</li> <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> <h1 class="title" translate="no">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" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#DerivedType-typedef">DerivedType</a></b></span></li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#NotTypedef-typedef">NotTypedef</a></b></span></li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#SomeType-typedef">SomeType</a></b></span></li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#funcPtr">funcPtr</a></b></span>(bool, const char *) : void (*)(bool)</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#inlineFunction">inlineFunction</a></b></span>()</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#methodWithEmDashInItsDocs">methodWithEmDashInItsDocs</a></b></span>()</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#methodWithEnDashInItsDocs">methodWithEnDashInItsDocs</a></b></span>()</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#overload">overload</a></b></span>()</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#overload-1">overload</a></b></span>(bool)</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#someFunction">someFunction</a></b></span>(int, int) : int</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#someFunctionDefaultArg">someFunctionDefaultArg</a></b></span>(int, bool)</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#virtualFun">virtualFun</a></b></span>()</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#virtualFun">virtualFun</a></b></span>()</li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#operator-eq">operator=</a></b></span>(TestQDoc::Test &&) : TestQDoc::Test &</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#DerivedType-typedef" translate="no">DerivedType</a></b></span></li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#NotTypedef-typedef" translate="no">NotTypedef</a></b></span></li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#SomeType-typedef" translate="no">SomeType</a></b></span></li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#funcPtr" translate="no">funcPtr</a></b></span>(bool, const char *) : void (*)(bool)</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#inlineFunction" translate="no">inlineFunction</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#methodWithEmDashInItsDocs" translate="no">methodWithEmDashInItsDocs</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#methodWithEnDashInItsDocs" translate="no">methodWithEnDashInItsDocs</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#overload" translate="no">overload</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#overload-1" translate="no">overload</a></b></span>(bool)</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#someFunction" translate="no">someFunction</a></b></span>(int, int) : int</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#someFunctionDefaultArg" translate="no">someFunctionDefaultArg</a></b></span>(int, bool)</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#virtualFun" translate="no">virtualFun</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#virtualFun" translate="no">virtualFun</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#operator-eq" translate="no">operator=</a></b></span>(TestQDoc::Test &&) : TestQDoc::Test &</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 index 7c8b639eb..45b378d62 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-obsolete.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-obsolete.html @@ -6,14 +6,14 @@ <title>Obsolete Members for TestDerived | TestCPP</title> </head> <body> -<li><a href="testcpp-module.html">C++ Classes</a></li> +<li><a href="testcpp-module.html" translate="no">C++ Classes</a></li> <li>TestDerived</li> <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> <h1 class="title" translate="no">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> +<p><b>The following members of class <a href="testqdoc-testderived.html" translate="no">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" translate="no"> -<tr><td class="memItemLeft topAlign rightAlign"> <code translate="no">(deprecated) </code>void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived-obsolete.html#staticObsoleteMember">staticObsoleteMember</a></b>()</td></tr> +<tr><td class="memItemLeft topAlign rightAlign"> <code translate="no">(deprecated) </code>void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived-obsolete.html#staticObsoleteMember" translate="no">staticObsoleteMember</a></b>()</td></tr> </table></div> <h2>Member Function Documentation</h2> <!-- $$$staticObsoleteMember[overload1]$$$staticObsoleteMember --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html index fb54ceee9..45d74870d 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html @@ -6,7 +6,7 @@ <title>TestDerived Class | TestCPP</title> </head> <body> -<li><a href="testcpp-module.html">C++ Classes</a></li> +<li><a href="testcpp-module.html" translate="no">C++ Classes</a></li> <li>TestDerived</li> <div class="sidebar"> <div class="toc"> @@ -19,7 +19,7 @@ </div> <div class="sidebar-content" id="sidebar-content"></div></div> <h1 class="title" translate="no">TestDerived Class</h1> -<span class="small-subtitle" translate="no">class <a href="testqdoc.html">TestQDoc</a>::TestDerived</span> +<span class="small-subtitle" translate="no">class <a href="testqdoc.html" translate="no">TestQDoc</a>::TestDerived</span> <!-- $$$TestDerived-brief --> <p>A derived class in a namespace. <a href="#details">More...</a></p> <!-- @@@TestDerived --> @@ -29,7 +29,7 @@ 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"> Since:</td><td class="memItemRight bottomAlign"> Qt 2.0</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> Inherits:</td><td class="memItemRight bottomAlign"> <a href="testqdoc-test.html">TestQDoc::Test</a></td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> Inherits:</td><td class="memItemRight bottomAlign"> <a href="testqdoc-test.html" translate="no">TestQDoc::Test</a></td></tr> </table></div> <ul> <li><a href="testqdoc-testderived-members.html">List of all members, including inherited members</a></li> @@ -37,12 +37,12 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> </ul> <h2 id="public-types">Public Types</h2> <div class="table"><table class="alignedsummary" translate="no"> -<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> +<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#DerivedType-typedef" translate="no">DerivedType</a></b></td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#NotTypedef-typedef" translate="no">NotTypedef</a></b></td></tr> </table></div> <h2 id="reimplemented-public-functions">Reimplemented Public Functions</h2> <div class="table"><table class="alignedsummary" translate="no"> -<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> +<tr><td class="memItemLeft rightAlign topAlign"> virtual void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#virtualFun" translate="no">virtualFun</a></b>() override</td></tr> </table></div> <!-- $$$TestDerived-description --> <div class="descr"> @@ -64,7 +64,7 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> <h2>Member Function Documentation</h2> <!-- $$$virtualFun[overload1]$$$virtualFun --> <h3 class="fn" translate="no" id="virtualFun"><code translate="no">[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> +<p>Reimplements: <a href="testqdoc-test.html#virtualFun" translate="no">Test::virtualFun</a>().</p> <!-- @@@virtualFun --> </div> </body> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html index 451e0ecdb..930d20d02 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html @@ -30,12 +30,12 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> </table></div> <h2 id="classes">Classes</h2> <div class="table"><table class="alignedsummary" translate="no"> -<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> +<tr><td class="memItemLeft rightAlign topAlign"> class </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html" translate="no">Test</a></b></td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> class </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html" translate="no">TestDerived</a></b></td></tr> </table></div> <h2 id="macros">Macros</h2> <div class="table"><table class="alignedsummary" translate="no"> -<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc.html#QDOCTEST_MACRO">QDOCTEST_MACRO</a></b></td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc.html#QDOCTEST_MACRO" translate="no">QDOCTEST_MACRO</a></b></td></tr> </table></div> <!-- $$$TestQDoc-description --> <div class="descr"> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/toc.html b/tests/auto/qdoc/generatedoutput/expected_output/toc.html index f34ce0db6..5901538d0 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/toc.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/toc.html @@ -16,9 +16,9 @@ <!-- $$$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> +<li><a href="qdoctests-qdocfileoutput.html" translate="no">QDoc Testing</a></li> +<li><a href="qdoctests-qdocfileoutput-linking.html" translate="no">QDoc Linking Test</a></li> +<li><a href="toc.html" translate="no">Table of Contents</a></li> </ul> </div> <!-- @@@toc.html --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput-exhaustive.html b/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput-exhaustive.html index ec3f9c419..3d0f323c8 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput-exhaustive.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput-exhaustive.html @@ -6,8 +6,8 @@ <title>Exhaustive testing of QDoc commands | OutputFromQDocFiles</title> </head> <body> -<li><a href="toc-test.html">TOC</a></li> -<li><a href="qdoctests-qdocfileoutput.html">Testing QDoc output from .qdoc files</a></li> +<li><a href="toc-test.html" translate="no">TOC</a></li> +<li><a href="qdoctests-qdocfileoutput.html" translate="no">Testing QDoc output from .qdoc files</a></li> <li>Exhaustive testing of QDoc commands</li> <li id="buildversion">OutputFromQDocFiles - A test project for QDoc build artifacts</li> <link rel="prev" href="qdoctests-qdocfileoutput.html" /> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput-linking.html b/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput-linking.html index a06ffd74d..8db2de22c 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput-linking.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput-linking.html @@ -6,7 +6,7 @@ <title>Testing QDoc's link command | OutputFromQDocFiles</title> </head> <body> -<li><a href="toc-test.html">TOC</a></li> +<li><a href="toc-test.html" translate="no">TOC</a></li> <li>Testing QDoc's link command</li> <li id="buildversion">OutputFromQDocFiles - A test project for QDoc build artifacts</li> <link rel="prev" href="qdoctests-qdocfileoutput-exhaustive.html" /> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput.html b/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput.html index ad47c1864..3a3c2a095 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput.html @@ -6,7 +6,7 @@ <title>Testing QDoc output from .qdoc files | OutputFromQDocFiles</title> </head> <body> -<li><a href="toc-test.html">TOC</a></li> +<li><a href="toc-test.html" translate="no">TOC</a></li> <li>Testing QDoc output from .qdoc files</li> <li id="buildversion">OutputFromQDocFiles - A test project for QDoc build artifacts</li> <link rel="next" href="qdoctests-qdocfileoutput-exhaustive.html" /> @@ -47,14 +47,14 @@ <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> +<li><a href="qdoctests-qdocfileoutput-linking.html" translate="no">Linking to a page title</a></li> +<li><a href="qdoctests-qdocfileoutput-linking.html#link-targets" translate="no">Linking to a section title</a></li> +<li><a href="qdoctests-qdocfileoutput-linking.html#link-test-target" translate="no">Linking using a \target string</a></li> +<li><a href="qdoctests-qdocfileoutput-linking.html" translate="no">Linking using a \keyword string</a></li> </ul> <h2 id="qdoc-linking-test">QDoc Linking Test</h2> <p>This section title is overridden by another target which takes precedence.</p> -<h2 id="linking-to-something-in-a-section-title">Linking to <a href="qdoctests-qdocfileoutput.html#further-information">something</a> in a section title</h2> +<h2 id="linking-to-something-in-a-section-title">Linking to <a href="qdoctests-qdocfileoutput.html#further-information" translate="no">something</a> in a section title</h2> <p>This is allowed but a questionable practice.</p> </div> <!-- @@@qdoctests-qdocfileoutput.html --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/toc-test.html b/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/toc-test.html index 08ec52c10..519109bc9 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/toc-test.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/toc-test.html @@ -12,17 +12,17 @@ <!-- $$$toc-test.html-description --> <div class="descr" id="details"> <ul> -<li><a href="qdoctests-qdocfileoutput.html">QDoc Testing</a><ul> -<li><a href="qdoctests-qdocfileoutput-exhaustive.html">Exhaustive testing of QDoc commands</a></li> +<li><a href="qdoctests-qdocfileoutput.html" translate="no">QDoc Testing</a><ul> +<li><a href="qdoctests-qdocfileoutput-exhaustive.html" translate="no">Exhaustive testing of QDoc commands</a></li> </ul> </li> <li>Linking<ul> -<li><a href="qdoctests-qdocfileoutput-linking.html">QDoc Linking Test</a><ul> -<li><a href="qdoctests-qdocfileoutput-linking.html#link-targets">Link targets</a></li> +<li><a href="qdoctests-qdocfileoutput-linking.html" translate="no">QDoc Linking Test</a><ul> +<li><a href="qdoctests-qdocfileoutput-linking.html#link-targets" translate="no">Link targets</a></li> </ul> </li> -<li><a href="crash.html">Random page</a></li> -<li><a href="toc.html">Table of Contents</a></li> +<li><a href="crash.html" translate="no">Random page</a></li> +<li><a href="toc.html" translate="no">Table of Contents</a></li> </ul> </li> </ul> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html b/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html index fb8882758..3e75ad12d 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html @@ -11,13 +11,13 @@ <!-- $$$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> +<p>This module is part of the <a href="test-componentset-example.html" translate="no">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> +<tr class="odd topAlign"><td class="tblName" translate="no"><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" translate="no"><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" translate="no"><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> |