diff options
author | Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> | 2022-11-24 00:07:55 +0100 |
---|---|---|
committer | Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> | 2022-12-15 17:57:17 +0100 |
commit | e5e1d8fa463e0f01b8f9c6c0cf4fe8ceab92c03c (patch) | |
tree | a8398aa95d2c5f957cc3e77311b3bb6b239beed8 | |
parent | 66cd1e4cd379dce28d235821b0d330114828e574 (diff) |
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>
(cherry picked from commit b7849d42efff91a4d247a4028d6c129f3742743a)
39 files changed, 284 insertions, 284 deletions
diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp index 6369ed755..41c1ec80d 100644 --- a/src/qdoc/htmlgenerator.cpp +++ b/src/qdoc/htmlgenerator.cpp @@ -72,7 +72,7 @@ static void addLink(const QString &linkTarget, const QStringRef &nestedStuff, QS if (!linkTarget.isEmpty()) { *res += QLatin1String("<a href=\""); *res += linkTarget; - *res += QLatin1String("\">"); + *res += QLatin1String("\" translate=\"no\">"); *res += nestedStuff; *res += QLatin1String("</a>"); } else { @@ -750,7 +750,7 @@ int HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMark NodeVector nv = map->values().toVector(); out() << "<p>Class "; - out() << "<a href=\"" << linkForNode(map.key(), relative) << "\">"; + out() << "<a href=\"" << linkForNode(map.key(), relative) << "\" translate=\"no\">"; QStringList pieces = map.key()->fullName().split("::"); out() << protectEnc(pieces.last()); out() << "</a>" @@ -2475,7 +2475,7 @@ QString HtmlGenerator::generateObsoleteMembersFile(const Sections §ions, Cod generateTitle(title, Text(), SmallSubTitle, aggregate, marker); out() << "<p><b>The following members of class " - << "<a href=\"" << linkForNode(aggregate, nullptr) << "\">" + << "<a href=\"" << linkForNode(aggregate, nullptr) << "\" translate=\"no\">" << protectEnc(aggregate->name()) << "</a>" << " are obsolete.</b> " << "They are provided to keep old source code working. " @@ -2636,7 +2636,7 @@ void HtmlGenerator::generateAnnotatedList(const Node *relative, CodeMarker *mark out() << "<tr class=\"odd topAlign\">"; else out() << "<tr class=\"even topAlign\">"; - out() << "<td class=\"tblName\"><p>"; + out() << "<td class=\"tblName\" translate=\"no\"><p>"; generateFullName(node, relative); out() << "</p></td>"; @@ -2749,7 +2749,7 @@ void HtmlGenerator::generateCompactList(ListType listType, const Node *relative, Output the alphabet as a row of links. */ if (includeAlphabet) { - out() << "<p class=\"centerAlign functionIndex\"><b>"; + out() << "<p class=\"centerAlign functionIndex\" translate=\"no\"><b>"; for (int i = 0; i < 26; i++) { QChar ch('a' + i); if (usedParagraphNames.contains(char('a' + i))) @@ -2761,7 +2761,7 @@ void HtmlGenerator::generateCompactList(ListType listType, const Node *relative, /* Output a <div> element to contain all the <dl> elements. */ - out() << "<div class=\"flowListDiv\">\n"; + out() << "<div class=\"flowListDiv\" translate=\"no\">\n"; numTableRows_ = 0; int curParNr = 0; @@ -2856,7 +2856,7 @@ void HtmlGenerator::generateCompactList(ListType listType, const Node *relative, void HtmlGenerator::generateFunctionIndex(const Node *relative) { - out() << "<p class=\"centerAlign functionIndex\"><b>"; + out() << "<p class=\"centerAlign functionIndex\" translate=\"no\"><b>"; for (int i = 0; i < 26; i++) { QChar ch('a' + i); out() << QString("<a href=\"#%1\">%2</a> ").arg(ch).arg(ch.toUpper()); @@ -2866,7 +2866,7 @@ void HtmlGenerator::generateFunctionIndex(const Node *relative) char nextLetter = 'a'; char currentLetter; - out() << "<ul>\n"; + out() << "<ul translate=\"no\">\n"; NodeMapMap &funcIndex = qdb_->getFunctionIndex(); for (auto fnMap = funcIndex.constBegin(); fnMap != funcIndex.constEnd(); ++fnMap) { out() << "<li>"; @@ -3008,7 +3008,7 @@ void HtmlGenerator::generateSection(const NodeVector &nv, const Node *relative, out() << "<div class=\"table\"><table class=\"alignedsummary\" translate=\"no\">\n"; } else { if (twoColumn) - out() << "<div class=\"table\"><table class=\"propsummary\">\n" + out() << "<div class=\"table\"><table class=\"propsummary\" translate=\"no\">\n" << "<tr><td class=\"topAlign\">"; out() << "<ul>\n"; } @@ -3545,7 +3545,7 @@ void HtmlGenerator::beginLink(const QString &link) if (showBrokenLinks) out() << "<i>"; } - out() << "<a href=\"" << link_ << "\">"; + out() << "<a href=\"" << link_ << "\" translate=\"no\">"; inLink_ = true; } @@ -3556,11 +3556,11 @@ void HtmlGenerator::beginLink(const QString &link, const Node *node, const Node if (showBrokenLinks) out() << "<i>"; } else if (node == nullptr || (relative != nullptr && node->status() == relative->status())) - out() << "<a href=\"" << link_ << "\">"; + out() << "<a href=\"" << link_ << "\" translate=\"no\">"; else if (node->isObsolete()) - out() << "<a href=\"" << link_ << "\" class=\"obsolete\">"; + out() << "<a href=\"" << link_ << "\" class=\"obsolete\" translate=\"no\">"; else - out() << "<a href=\"" << link_ << "\">"; + out() << "<a href=\"" << link_ << "\" translate=\"no\">"; inLink_ = true; } @@ -3627,7 +3627,7 @@ void HtmlGenerator::generateDetailedQmlMember(Node *node, const Aggregate *relat generateExtractionMark(node, MemberMark); generateKeywordAnchors(node); - QString qmlItemHeader("<div class=\"qmlproto\">\n" + QString qmlItemHeader("<div class=\"qmlproto\" translate=\"no\">\n" "<div class=\"table\"><table class=\"qmlname\">\n"); QString qmlItemStart("<tr valign=\"top\" class=\"odd\" id=\"%1\">\n" 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 4ceaca3b6..7e7917916 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype-members.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype-members.html @@ -11,16 +11,16 @@ <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-alias">DerivedType</a></b></span></li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#NotTypedef-alias">NotTypedef</a></b></span></li> -<li class="fn" translate="no">typedef <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#inlineFunction">inlineFunction</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</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#virtualFun">virtualFun</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#DerivedType-alias" translate="no">DerivedType</a></b></span></li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#NotTypedef-alias" translate="no">NotTypedef</a></b></span></li> +<li class="fn" translate="no">typedef <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#inlineFunction" translate="no">inlineFunction</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</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#virtualFun" translate="no">virtualFun</a></b></span>()</li> </ul> </body> </html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype.html b/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype.html index c49aae8fa..730d10dc8 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype.html @@ -23,13 +23,13 @@ <!-- @@@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></table></div><ul> +</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> <a name="public-functions"></a> <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> <a name="details"></a> <!-- $$$TestType-description --> @@ -39,12 +39,12 @@ <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> </ul> </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/dontdocument/classes.html b/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/classes.html index f5bae610a..8d16389cb 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/classes.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/classes.html @@ -12,9 +12,9 @@ <!-- $$$classes.html-description --> <div class="descr"> <a name="details"></a> <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/headerfile/headers.html b/tests/auto/qdoc/generatedoutput/expected_output/headerfile/headers.html index 65b88eca4..eeed3cf9f 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/headerfile/headers.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/headerfile/headers.html @@ -14,7 +14,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 15b503c6e..82ee93ea6 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"> @@ -26,17 +26,17 @@ <a name="types"></a> <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> <a name="variables"></a> <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> <a name="functions"></a> <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> <a name="details"></a> <!-- $$$<TestHeader>-description --> 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 d4b428455..224156da5 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc-test.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc-test.html @@ -20,13 +20,13 @@ </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 --> <div class="table"><table class="alignedsummary" translate="no"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <Test></span> -</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p> +</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html" translate="no">TestQDoc::TestDerived</a></p> </td></tr></table></div><ul> <li><a href="testqdoc-test-members.html">List of all members, including inherited members</a></li> <li><a href="testqdoc-test-obsolete.html">Obsolete members</a></li> @@ -34,26 +34,26 @@ <a name="public-types"></a> <h2 id="public-types">Public Types</h2> <div class="table"><table class="alignedsummary" translate="no"> -<tr><td class="memItemLeft rightAlign topAlign"> typedef </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#SomeType-typedef">SomeType</a></b></td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> typedef </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#SomeType-typedef" translate="no">SomeType</a></b></td></tr> </table></div> <a name="public-functions"></a> <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="testqdoc-test.html#inlineFunction">inlineFunction</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> int </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunction">someFunction</a></b>(int <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"> 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"> int </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunction" translate="no">someFunction</a></b>(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> </table></div> <a name="protected-functions"></a> <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> <a name="macros"></a> <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>(<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>(<i>x</i>)</td></tr> </table></div> <a name="details"></a> <!-- $$$Test-description --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html b/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html index 56b4b0e41..0a7fa08d3 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html @@ -28,13 +28,13 @@ <a name="classes"></a> <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> <a name="macros"></a> <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> <a name="details"></a> <!-- $$$TestQDoc-description --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/index.html b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/index.html index fd9fdd50a..3686b3763 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/index.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/index.html @@ -13,15 +13,15 @@ <a name="c-classes"></a> <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> <a name="qml-types"></a> <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 207cc5e54..6fed07e02 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent-members.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent-members.html @@ -10,8 +10,8 @@ <h1 class="title" 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><b><a href="qml-qdoc-test-abstractparent.html#children-prop">children</a></b></b> : list<Child> [default]</li> -<li class="fn" translate="no">void <b><b><a href="qml-qdoc-test-abstractparent.html#rear-method">rear</a></b></b>(Child <i>child</i>)</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-abstractparent.html#children-prop" translate="no">children</a></b></b> : list<Child> [default]</li> +<li class="fn" translate="no">void <b><b><a href="qml-qdoc-test-abstractparent.html#rear-method" translate="no">rear</a></b></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 388c3ad14..148b0bc12 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 @@ -22,19 +22,19 @@ <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"> 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"> 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> <a name="properties"></a> <h2 id="properties">Properties</h2> <ul> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-abstractparent.html#children-prop">children</a></b></b> : list<Child></li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-abstractparent.html#children-prop" translate="no">children</a></b></b> : list<Child></li> </ul> <a name="methods"></a> <h2 id="methods">Methods</h2> <ul> -<li class="fn" translate="no">void <b><b><a href="qml-qdoc-test-abstractparent.html#rear-method">rear</a></b></b>(Child <i>child</i>)</li> +<li class="fn" translate="no">void <b><b><a href="qml-qdoc-test-abstractparent.html#rear-method" translate="no">rear</a></b></b>(Child <i>child</i>)</li> </ul> <!-- $$$AbstractParent-description --> <a name="details"></a> @@ -43,11 +43,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> -<a name="children-prop"></a><span class="qmldefault">[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> +<a name="children-prop"></a><span class="qmldefault">[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> @@ -55,11 +55,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> -<a name="rear-method"></a><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> +<a name="rear-method"></a><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.html b/tests/auto/qdoc/generatedoutput/expected_output/index.html index cb5b7b6db..1efeb9166 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/index.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/index.html @@ -11,10 +11,10 @@ <!-- $$$index.html-description --> <div class="descr"> <a name="details"></a> <div class="table"><table class="annotated"> -<tr class="odd topAlign"><td class="tblName"><p><a href="first.html">First</a></p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="">First::Nested</a></p></td></tr> -<tr class="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</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 a95da1a53..f264ca881 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/nestedmacro/testcpp-module.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/nestedmacro/testcpp-module.html @@ -24,13 +24,13 @@ <a name="namespaces"></a> <h2 id="namespaces">Namespaces</h2> <div class="table"><table class="annotated"> -<tr class="odd 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="testqdoc.html">TestQDoc</a></p></td><td class="tblDescr"><p>A namespace</p></td></tr> </table></div> <a name="classes"></a> <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 --> <a name="details"></a> 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 f41401189..d5f16bcb0 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 @@ -25,9 +25,9 @@ <!-- $$$componentset-description --> <div class="descr"> <a name="details"></a> <p>This example demonstrates one of the ways to document QML types.</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> <a name="qml-class"></a> <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> 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 92b709485..908a2a365 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html @@ -15,11 +15,11 @@ </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-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-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 1e7cab0e7..ed48aa30f 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html @@ -42,10 +42,10 @@ <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> </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 aab8cee9d..511d42df6 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html @@ -20,7 +20,7 @@ <a name="methods"></a> <h2 id="methods">Methods</h2> <ul> -<li class="fn" translate="no">int <b><b><a href="qml-int.html#abs-method">abs</a></b></b>()</li> +<li class="fn" translate="no">int <b><b><a href="qml-int.html#abs-method" translate="no">abs</a></b></b>()</li> </ul> <!-- $$$int-description --> <div class="descr"> <a name="details"></a> @@ -28,11 +28,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> -<a name="abs-method"></a><span class="type"><a href="qml-int.html">int</a></span> <span class="name">abs</span>()</p></td></tr> +<a name="abs-method"></a><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-qdoc-test-abstractparent.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-abstractparent.html index e34855a81..4c2d93386 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 @@ -22,19 +22,19 @@ <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"> 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"> 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> <a name="properties"></a> <h2 id="properties">Properties</h2> <ul> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-abstractparent.html#children-prop">children</a></b></b> : list<Child></li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-abstractparent.html#children-prop" translate="no">children</a></b></b> : list<Child></li> </ul> <a name="methods"></a> <h2 id="methods">Methods</h2> <ul> -<li class="fn" translate="no">void <b><b><a href="qml-qdoc-test-abstractparent.html#rear-method">rear</a></b></b>(Child <i>child</i>, var <i>method</i>)</li> +<li class="fn" translate="no">void <b><b><a href="qml-qdoc-test-abstractparent.html#rear-method" translate="no">rear</a></b></b>(Child <i>child</i>, var <i>method</i>)</li> </ul> <!-- $$$AbstractParent-description --> <a name="details"></a> @@ -42,22 +42,22 @@ <!-- @@@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> -<a name="children-prop"></a><span class="qmldefault">[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> +<a name="children-prop"></a><span class="qmldefault">[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/> <h2>Method Documentation</h2> <!-- $$$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> -<a name="rear-method"></a><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> +<a name="rear-method"></a><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 ff37f4965..039c541bc 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 @@ -22,19 +22,19 @@ <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"> 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"> 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> <a name="properties"></a> <h2 id="properties">Properties</h2> <ul> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-child.html#children-prop">children</a></b></b> : list<Child></li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-child.html#children-prop" translate="no">children</a></b></b> : list<Child></li> </ul> <a name="methods"></a> <h2 id="methods">Methods</h2> <ul> -<li class="fn" translate="no">void <b><b><a href="qml-qdoc-test-child.html#rear-method">rear</a></b></b>(Child <i>child</i>, var <i>method</i>)</li> +<li class="fn" translate="no">void <b><b><a href="qml-qdoc-test-child.html#rear-method" translate="no">rear</a></b></b>(Child <i>child</i>, var <i>method</i>)</li> </ul> <!-- $$$Child-description --> <a name="details"></a> @@ -42,22 +42,22 @@ <!-- @@@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> -<a name="children-prop"></a><span class="qmldefault">[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> +<a name="children-prop"></a><span class="qmldefault">[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/> <h2>Method Documentation</h2> <!-- $$$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> -<a name="rear-method"></a><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> +<a name="rear-method"></a><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 9036a4dfc..168ed5b6c 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 @@ -30,20 +30,20 @@ <a name="properties"></a> <h2 id="properties">Properties</h2> <ul> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-doctest.html#active-prop">active</a></b></b> : bool</li> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-doctest.html#name-prop">name</a></b></b> : string</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-doctest.html#active-prop" translate="no">active</a></b></b> : bool</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-doctest.html#name-prop" translate="no">name</a></b></b> : string</li> </ul> <a name="signals"></a> <h2 id="signals">Signals</h2> <ul> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-doctest.html#completed-signal">completed</a></b></b>()</li> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-doctest.html#foo-signal">foo</a></b></b>(var <i>bar</i>)</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-doctest.html#completed-signal" translate="no">completed</a></b></b>()</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-doctest.html#foo-signal" translate="no">foo</a></b></b>(var <i>bar</i>)</li> </ul> <a name="methods"></a> <h2 id="methods">Methods</h2> <ul> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-doctest.html#fail-method">fail</a></b></b>(<i>message</i>)</li> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-doctest.html#fail_hard-method">fail_hard</a></b></b>(<i>msg</i>, <i>option</i>)</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-doctest.html#fail-method" translate="no">fail</a></b></b>(<i>message</i>)</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-doctest.html#fail_hard-method" translate="no">fail_hard</a></b></b>(<i>msg</i>, <i>option</i>)</li> </ul> <!-- $$$DocTest-description --> <a name="details"></a> @@ -54,25 +54,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> <a name="active-prop"></a><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> <a name="name-prop"></a><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> @@ -80,7 +80,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> @@ -90,7 +90,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> @@ -102,7 +102,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> @@ -113,7 +113,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 450f492fc..fb955c684 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-members.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-members.html @@ -10,22 +10,22 @@ <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><b><a href="qml-qdoc-test-type.html#fifth-prop">fifth</a></b></b> : int</li> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#fourth-prop">fourth</a></b></b> : int</li> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#group-prop">group</a></b></b><ul> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#group.first-prop">group.first</a></b></b> : int</li> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#group.second-prop">group.second</a></b></b> : int</li> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#group.third-prop">group.third</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#fifth-prop" translate="no">fifth</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#fourth-prop" translate="no">fourth</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#group-prop" translate="no">group</a></b></b><ul> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#group.first-prop" translate="no">group.first</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#group.second-prop" translate="no">group.second</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#group.third-prop" translate="no">group.third</a></b></b> : int</li> </ul> </li> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#id-prop">id</a></b></b> : int</li> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#name-prop">name</a></b></b> : string</li> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#type-attached-prop">type</a></b></b> : enumeration [attached]</li> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#completed-signal">completed</a></b></b>(int <i>status</i>)</li> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#configured-signal">configured</a></b></b>() [attached]</li> -<li class="fn" translate="no">Type <b><b><a href="qml-qdoc-test-type.html#copy-method">copy</a></b></b>(<i>a</i>)</li> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#disable-method">disable</a></b></b>()</li> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#enable-method">enable</a></b></b>()</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#id-prop" translate="no">id</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#name-prop" translate="no">name</a></b></b> : string</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#type-attached-prop" translate="no">type</a></b></b> : enumeration [attached]</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#completed-signal" translate="no">completed</a></b></b>(int <i>status</i>)</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#configured-signal" translate="no">configured</a></b></b>() [attached]</li> +<li class="fn" translate="no">Type <b><b><a href="qml-qdoc-test-type.html#copy-method" translate="no">copy</a></b></b>(<i>a</i>)</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#disable-method" translate="no">disable</a></b></b>()</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#enable-method" translate="no">enable</a></b></b>()</li> </ul> </body> </html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html index cc8cc47ae..ed9c9a9d4 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 @@ -25,44 +25,44 @@ <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"> Instantiates:</td><td class="memItemRight bottomAlign"> <a href="qml-qdoc-test-type.html"><a href="testqdoc-test.html">Test</a></td></tr></table></div><ul> +<tr><td class="memItemLeft rightAlign topAlign"> Import Statement:</td><td class="memItemRight bottomAlign"> import QDoc.Test 1.1</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Instantiates:</td><td class="memItemRight bottomAlign"> <a href="qml-qdoc-test-type.html" translate="no"><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> </ul> <a name="properties"></a> <h2 id="properties">Properties</h2> <ul> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#fifth-prop">fifth</a></b></b> : int</li> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#fourth-prop">fourth</a></b></b> : int</li> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#group-prop">group</a></b></b><ul> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#group.first-prop">group.first</a></b></b> : int</li> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#group.second-prop">group.second</a></b></b> : int</li> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#group.third-prop">group.third</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#fifth-prop" translate="no">fifth</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#fourth-prop" translate="no">fourth</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#group-prop" translate="no">group</a></b></b><ul> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#group.first-prop" translate="no">group.first</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#group.second-prop" translate="no">group.second</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#group.third-prop" translate="no">group.third</a></b></b> : int</li> </ul> </li> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#id-prop">id</a></b></b> : int</li> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#name-prop">name</a></b></b> : string</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#id-prop" translate="no">id</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#name-prop" translate="no">name</a></b></b> : string</li> </ul> <a name="attached-properties"></a> <h2 id="attached-properties">Attached Properties</h2> <ul> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#type-attached-prop">type</a></b></b> : enumeration</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#type-attached-prop" translate="no">type</a></b></b> : enumeration</li> </ul> <a name="signals"></a> <h2 id="signals">Signals</h2> <ul> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#completed-signal">completed</a></b></b>(int <i>status</i>)</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#completed-signal" translate="no">completed</a></b></b>(int <i>status</i>)</li> </ul> <a name="attached-signals"></a> <h2 id="attached-signals">Attached Signals</h2> <ul> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#configured-signal">configured</a></b></b>()</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#configured-signal" translate="no">configured</a></b></b>()</li> </ul> <a name="methods"></a> <h2 id="methods">Methods</h2> <ul> -<li class="fn" translate="no">Type <b><b><a href="qml-qdoc-test-type.html#copy-method">copy</a></b></b>(<i>a</i>)</li> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#disable-method">disable</a></b></b>()</li> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#enable-method">enable</a></b></b>()</li> +<li class="fn" translate="no">Type <b><b><a href="qml-qdoc-test-type.html#copy-method" translate="no">copy</a></b></b>(<i>a</i>)</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#disable-method" translate="no">disable</a></b></b>()</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#enable-method" translate="no">enable</a></b></b>()</li> </ul> <!-- $$$Type-description --> <a name="details"></a> @@ -71,47 +71,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> -<a name="fifth-prop"></a><span class="name">fifth</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> +<a name="fifth-prop"></a><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> -<a name="fourth-prop"></a><span class="name">fourth</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> +<a name="fourth-prop"></a><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><a name="group-prop"></a><b>group group</b></p></th></tr> <tr valign="top" class="odd" id="group.first-prop"> <td class="tblQmlPropNode"><p> -<a name="group.first-prop"></a><span class="name">group.first</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> +<a name="group.first-prop"></a><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> -<a name="group.second-prop"></a><span class="name">group.second</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> +<a name="group.second-prop"></a><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> -<a name="group.third-prop"></a><span class="name">group.third</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> +<a name="group.third-prop"></a><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> -<a name="id-prop"></a><span class="qmlreadonly">[read-only] </span><span class="name">id</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> +<a name="id-prop"></a><span class="qmlreadonly">[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> @@ -122,7 +122,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> @@ -136,11 +136,11 @@ <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> -<a name="completed-signal"></a><span class="name">completed</span>(<span class="type"><a href="qml-int.html">int</a></span> <i>status</i>)</p></td></tr> +<a name="completed-signal"></a><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> @@ -148,7 +148,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> @@ -161,7 +161,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> @@ -174,11 +174,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> -<a name="copy-method"></a><span class="type"><a href="qml-qdoc-test-type.html">Type</a></span> <span class="name">copy</span>(<i>a</i>)</p></td></tr> +<a name="copy-method"></a><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-uicomponents-progressbar.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html index 1cbc06fde..f54873ac7 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html @@ -27,68 +27,68 @@ <a name="properties"></a> <h2 id="properties">Properties</h2> <ul> -<li class="fn" translate="no"><b><b><a href="qml-uicomponents-progressbar.html#color-prop">color</a></b></b> : color</li> -<li class="fn" translate="no"><b><b><a href="qml-uicomponents-progressbar.html#maximum-prop">maximum</a></b></b> : int</li> -<li class="fn" translate="no"><b><b><a href="qml-uicomponents-progressbar.html#minimum-prop">minimum</a></b></b> : int</li> -<li class="fn" translate="no"><b><b><a href="qml-uicomponents-progressbar.html#secondColor-prop">secondColor</a></b></b> : color</li> -<li class="fn" translate="no"><b><b><a href="qml-uicomponents-progressbar.html#value-prop">value</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-uicomponents-progressbar.html#color-prop" translate="no">color</a></b></b> : color</li> +<li class="fn" translate="no"><b><b><a href="qml-uicomponents-progressbar.html#maximum-prop" translate="no">maximum</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-uicomponents-progressbar.html#minimum-prop" translate="no">minimum</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-uicomponents-progressbar.html#secondColor-prop" translate="no">secondColor</a></b></b> : color</li> +<li class="fn" translate="no"><b><b><a href="qml-uicomponents-progressbar.html#value-prop" translate="no">value</a></b></b> : int</li> </ul> <!-- $$$ProgressBar-description --> <a name="details"></a> <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> <a name="color-prop"></a><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> -<a name="maximum-prop"></a><span class="name">maximum</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> +<a name="maximum-prop"></a><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> -<a name="minimum-prop"></a><span class="name">minimum</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> +<a name="minimum-prop"></a><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> <a name="secondColor-prop"></a><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> -<a name="value-prop"></a><span class="name">value</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> +<a name="value-prop"></a><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 94af97bc1..fd6851a7a 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html @@ -28,23 +28,23 @@ <a name="properties"></a> <h2 id="properties">Properties</h2> <ul> -<li class="fn" translate="no"><b><b><a href="qml-uicomponents-switch.html#on-prop">on</a></b></b> : bool</li> +<li class="fn" translate="no"><b><b><a href="qml-uicomponents-switch.html#on-prop" translate="no">on</a></b></b> : bool</li> </ul> <a name="methods"></a> <h2 id="methods">Methods</h2> <ul> -<li class="fn" translate="no"><b><b><a href="qml-uicomponents-switch.html#toggle-method">toggle</a></b></b>()</li> +<li class="fn" translate="no"><b><b><a href="qml-uicomponents-switch.html#toggle-method" translate="no">toggle</a></b></b>()</li> </ul> <!-- $$$Switch-description --> <a name="details"></a> <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> @@ -55,7 +55,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 a80d851d5..3b13a4cf3 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html @@ -28,15 +28,15 @@ <a name="properties"></a> <h2 id="properties">Properties</h2> <ul> -<li class="fn" translate="no"><b><b><a href="qml-uicomponents-tabwidget.html#current-prop">current</a></b></b> : int</li> -<li class="fn" translate="no"><b><b><a href="qml-uicomponents-tabwidget.html#sampleReadOnlyProperty-prop">sampleReadOnlyProperty</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-uicomponents-tabwidget.html#current-prop" translate="no">current</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-uicomponents-tabwidget.html#sampleReadOnlyProperty-prop" translate="no">sampleReadOnlyProperty</a></b></b> : int</li> </ul> <!-- $$$TabWidget-description --> <a name="details"></a> <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> <a name="adding-tabs"></a> <h2 id="adding-tabs">Adding Tabs</h2> <p>To add a tab, declare the tab as a child of the TabWidget.</p> @@ -58,25 +58,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> -<a name="current-prop"></a><span class="name">current</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> +<a name="current-prop"></a><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> -<a name="sampleReadOnlyProperty-prop"></a><span class="qmlreadonly">[read-only] </span><span class="name">sampleReadOnlyProperty</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> +<a name="sampleReadOnlyProperty-prop"></a><span class="qmlreadonly">[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/qmlpropertygroups/qml-qdoc-test-anotherchild-members.html b/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-anotherchild-members.html index 8c954e21e..d63f61717 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-anotherchild-members.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-anotherchild-members.html @@ -10,14 +10,14 @@ <h1 class="title" 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><b><a href="qml-qdoc-test-anotherchild.html#name-prop">name</a></b></b> : string</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-anotherchild.html#name-prop" translate="no">name</a></b></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><b><a href="qml-qdoc-test-parent.html#group-prop">group</a></b></b><ul> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-parent.html#group.a-prop">group.a</a></b></b> : int</li> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-parent.html#group.b-prop">group.b</a></b></b> : int</li> -<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-parent.html#group.c-prop">group.c</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-parent.html#group-prop" translate="no">group</a></b></b><ul> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-parent.html#group.a-prop" translate="no">group.a</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-parent.html#group.b-prop" translate="no">group.b</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-parent.html#group.c-prop" translate="no">group.c</a></b></b> : int</li> </ul> </li> </ul> 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 848104596..ba7980302 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html @@ -20,13 +20,13 @@ </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 --> <div class="table"><table class="alignedsummary" translate="no"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <Test></span> -</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p> +</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html" translate="no">TestQDoc::TestDerived</a></p> </td></tr></table></div><ul> <li><a href="testqdoc-test-members.html">List of all members, including inherited members</a></li> <li><a href="testqdoc-test-obsolete.html">Obsolete members</a></li> @@ -34,27 +34,27 @@ <a name="public-types"></a> <h2 id="public-types">Public Types</h2> <div class="table"><table class="alignedsummary" translate="no"> -<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"> typedef </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 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"> typedef </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#SomeType-typedef" translate="no">SomeType</a></b></td></tr> </table></div> <a name="public-functions"></a> <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="testqdoc-test.html#inlineFunction">inlineFunction</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> int </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunction">someFunction</a></b>(int <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"> 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"> int </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunction" translate="no">someFunction</a></b>(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> </table></div> <a name="protected-functions"></a> <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> <a name="macros"></a> <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>(<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>(<i>x</i>)</td></tr> </table></div> <a name="details"></a> <!-- $$$Test-description --> 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 0190895b2..dd707aa1a 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 @@ -16,7 +16,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 4a7d8d225..25b61dafa 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test.html @@ -20,13 +20,13 @@ </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 --> <div class="table"><table class="alignedsummary" translate="no"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <Test></span> -</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p> +</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html" translate="no">TestQDoc::TestDerived</a></p> </td></tr></table></div><ul> <li><a href="testqdoc-test-members.html">List of all members, including inherited members</a></li> <li><a href="testqdoc-test-obsolete.html">Obsolete members</a></li> @@ -34,29 +34,29 @@ <a name="public-types"></a> <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"> typedef </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#SomeType-typedef">SomeType</a></b></td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> (alias) </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#Specialized-alias">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"> typedef </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"> (alias) </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#Specialized-alias" translate="no">Specialized</a></b></td></tr> </table></div> <a name="public-functions"></a> <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="testqdoc-test.html#inlineFunction">inlineFunction</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> int </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunction">someFunction</a></b>(int <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"> 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"> int </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunction" translate="no">someFunction</a></b>(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> </table></div> <a name="protected-functions"></a> <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> <a name="macros"></a> <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>(<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>(<i>x</i>)</td></tr> </table></div> <a name="details"></a> <!-- $$$Test-description --> 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 dc123674d..f3e8249b7 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/test-cmaketest-example.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/test-cmaketest-example.html @@ -13,8 +13,8 @@ <div class="descr"> <a name="details"></a> <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 7fb077a0f..bf7f83f6b 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html @@ -25,9 +25,9 @@ <!-- $$$componentset-description --> <div class="descr"> <a name="details"></a> <p>This example demonstrates one of the ways to document QML types.</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> <a name="qml-class"></a> <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> @@ -47,10 +47,10 @@ 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-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> </ul> </div> <!-- @@@componentset --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html b/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html index 0dc512bc9..d1c1b9754 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html @@ -24,13 +24,13 @@ <a name="namespaces"></a> <h2 id="namespaces">Namespaces</h2> <div class="table"><table class="annotated"> -<tr class="odd 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="testqdoc.html">TestQDoc</a></p></td><td class="tblDescr"><p>A namespace</p></td></tr> </table></div> <a name="classes"></a> <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 --> <a name="details"></a> 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 77d10f68a..76770c5c3 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html @@ -11,13 +11,13 @@ <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">typedef <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#inlineFunction">inlineFunction</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</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">typedef <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#inlineFunction" translate="no">inlineFunction</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</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> </ul> </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 04d8e08af..412789b86 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html @@ -20,13 +20,13 @@ </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 --> <div class="table"><table class="alignedsummary" translate="no"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <Test></span> -</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p> +</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html" translate="no">TestQDoc::TestDerived</a></p> </td></tr></table></div><ul> <li><a href="testqdoc-test-members.html">List of all members, including inherited members</a></li> <li><a href="testqdoc-test-obsolete.html">Obsolete members</a></li> @@ -34,26 +34,26 @@ <a name="public-types"></a> <h2 id="public-types">Public Types</h2> <div class="table"><table class="alignedsummary" translate="no"> -<tr><td class="memItemLeft rightAlign topAlign"> typedef </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#SomeType-typedef">SomeType</a></b></td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> typedef </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#SomeType-typedef" translate="no">SomeType</a></b></td></tr> </table></div> <a name="public-functions"></a> <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="testqdoc-test.html#inlineFunction">inlineFunction</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> int </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunction">someFunction</a></b>(int <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"> 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"> int </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunction" translate="no">someFunction</a></b>(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> </table></div> <a name="protected-functions"></a> <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> <a name="macros"></a> <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>(<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>(<i>x</i>)</td></tr> </table></div> <a name="details"></a> <!-- $$$Test-description --> 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 b93e5ed10..74cea6212 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-members.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-members.html @@ -11,15 +11,15 @@ <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-alias">DerivedType</a></b></span></li> -<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#NotTypedef-alias">NotTypedef</a></b></span></li> -<li class="fn" translate="no">typedef <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#inlineFunction">inlineFunction</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</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#virtualFun">virtualFun</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#DerivedType-alias" translate="no">DerivedType</a></b></span></li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#NotTypedef-alias" translate="no">NotTypedef</a></b></span></li> +<li class="fn" translate="no">typedef <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#inlineFunction" translate="no">inlineFunction</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</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#virtualFun" translate="no">virtualFun</a></b></span>()</li> </ul> </body> </html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-obsolete.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-obsolete.html index fcc383701..136f3c900 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-obsolete.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-obsolete.html @@ -9,10 +9,10 @@ <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 obsolete.</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 obsolete.</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">(obsolete) </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">(obsolete) </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 bed496f86..55b9ac6b9 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html @@ -18,26 +18,26 @@ </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 --> <div class="table"><table class="alignedsummary" translate="no"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <TestDerived></span> -</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherits:</td><td class="memItemRight bottomAlign"> <a href="testqdoc-test.html">TestQDoc::Test</a></td></tr></table></div><ul> +</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherits:</td><td class="memItemRight bottomAlign"> <a href="testqdoc-test.html" 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> <li><a href="testqdoc-testderived-obsolete.html">Obsolete members</a></li> </ul> <a name="public-types"></a> <h2 id="public-types">Public Types</h2> <div class="table"><table class="alignedsummary" translate="no"> -<tr><td class="memItemLeft rightAlign topAlign"> (alias) </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#DerivedType-alias">DerivedType</a></b></td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> (alias) </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#NotTypedef-alias">NotTypedef</a></b></td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> (alias) </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#DerivedType-alias" translate="no">DerivedType</a></b></td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> (alias) </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#NotTypedef-alias" translate="no">NotTypedef</a></b></td></tr> </table></div> <a name="reimplemented-public-functions"></a> <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> <a name="details"></a> <!-- $$$TestDerived-description --> @@ -49,7 +49,7 @@ <h2>Member Type Documentation</h2> <!-- $$$DerivedType --> <h3 class="fn" translate="no" id="DerivedType-alias"><a name="DerivedType-alias"></a><code translate="no">[alias] </code>TestDerived::<span class="name">DerivedType</span></h3> -<p>This is a type alias for <a href="testqdoc-test.html#SomeType-typedef">TestQDoc::Test::SomeType</a>.</p> +<p>This is a type alias for <a href="testqdoc-test.html#SomeType-typedef" translate="no">TestQDoc::Test::SomeType</a>.</p> <p>An aliased typedef.</p> <!-- @@@DerivedType --> <!-- $$$NotTypedef --> @@ -62,7 +62,7 @@ <h2>Member Function Documentation</h2> <!-- $$$virtualFun[overload1]$$$virtualFun --> <h3 class="fn" translate="no" id="virtualFun"><a name="virtualFun"></a><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 56b4b0e41..0a7fa08d3 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html @@ -28,13 +28,13 @@ <a name="classes"></a> <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> <a name="macros"></a> <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> <a name="details"></a> <!-- $$$TestQDoc-description --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html b/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html index 86f277654..9123cb1a7 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html @@ -12,13 +12,13 @@ <!-- $$$UIComponents-description --> <div class="descr"> <a name="details"></a> <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> |