diff options
author | Topi Reinio <topi.reinio@qt.io> | 2024-03-26 15:22:34 +0000 |
---|---|---|
committer | Topi Reinio <topi.reinio@qt.io> | 2024-05-16 12:27:16 +0000 |
commit | 06d408f9e65c80df2a4ea25f860f5424a45eac27 (patch) | |
tree | 069fcb172926f9086a2cbee1abe2c185854780a4 | |
parent | 649deffc673032a58cb2544f54cd3b2f96a08426 (diff) |
qdoc: HTML generator: Use translate="no" only for links to API entities
In most cases, the HTML generator has access to the Node that's
associated with the target when creating a link. If the Node
represents an API entity, add the translate="no" attribute to the
link; otherwise allow translations of the link text.
This improves the translation results as links to section and
page titles are translated as expected.
Fixes: QTBUG-123782
Change-Id: Ic6e0ee5a93f7005a892798d687f1c390f339a724
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
34 files changed, 70 insertions, 68 deletions
diff --git a/src/qdoc/qdoc/src/qdoc/htmlgenerator.cpp b/src/qdoc/qdoc/src/qdoc/htmlgenerator.cpp index 455354493..67672f0de 100644 --- a/src/qdoc/qdoc/src/qdoc/htmlgenerator.cpp +++ b/src/qdoc/qdoc/src/qdoc/htmlgenerator.cpp @@ -714,8 +714,7 @@ qsizetype HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, Co location.warning( QStringLiteral("Can't link to '%1'").arg(atom->string())); } - beginLink(link, nullptr, relative); - m_linkNode = node; + beginLink(link, node, relative); skipAhead = 1; } break; case Atom::ExampleFileLink: { @@ -3535,12 +3534,15 @@ void HtmlGenerator::beginLink(const QString &link, const Node *node, const Node if (m_link.isEmpty()) return; + const QString &translate_attr = + (node && node->genus() & Node::API) ? " translate=\"no\""_L1 : ""_L1; + if (node == nullptr || (relative != nullptr && node->status() == relative->status())) - out() << "<a href=\"" << m_link << "\" translate=\"no\">"; + out() << "<a href=\"" << m_link << "\"%1>"_L1.arg(translate_attr); else if (node->isDeprecated()) - out() << "<a href=\"" << m_link << "\" class=\"obsolete\" translate=\"no\">"; + out() << "<a href=\"" << m_link << "\" class=\"obsolete\"%1>"_L1.arg(translate_attr); else - out() << "<a href=\"" << m_link << "\" translate=\"no\">"; + out() << "<a href=\"" << m_link << "\"%1>"_L1.arg(translate_attr); } void HtmlGenerator::endLink() diff --git a/src/qdoc/qdoc/tests/generatedoutput/expected_output/autolinking.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/autolinking.html index 444c3d0d1..ac04c33cd 100644 --- a/src/qdoc/qdoc/tests/generatedoutput/expected_output/autolinking.html +++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/autolinking.html @@ -19,7 +19,7 @@ <!-- $$$autolinking.html-description --> <div class="descr" id="details"> <h2 id="testqdoc">TestQDoc</h2> -<p>The string <a href="testqdoc.html" translate="no">TestQDoc</a> links to the C++ namespace unless linking explicitly, <a href="autolinking.html#testqdoc" translate="no">like this</a>, or <a href="testqdoc.html" translate="no">this</a>. Also,</p> +<p>The string <a href="testqdoc.html" translate="no">TestQDoc</a> links to the C++ namespace unless linking explicitly, <a href="autolinking.html#testqdoc">like this</a>, or <a href="testqdoc.html" translate="no">this</a>. Also,</p> <p>Autolinks:</p> <ul> <li><a href="testqdoc-testderived.html" translate="no">TestQDoc::TestDerived</a></li> @@ -27,7 +27,7 @@ <p>Explicit links:</p> <ul> <li><a href="testqdoc-testderived.html" translate="no">TestQDoc::TestDerived</a></li> -<li><a href="obsolete-classes.html#testqdoc" translate="no">Obsolete Classes#TestQDoc</a></li> +<li><a href="obsolete-classes.html#testqdoc">Obsolete Classes#TestQDoc</a></li> </ul> <h2 id="someprop">someProp</h2> </div> diff --git a/src/qdoc/qdoc/tests/generatedoutput/expected_output/noautolist/testcpp-module.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/noautolist/testcpp-module.html index f413175b0..6b58461da 100644 --- a/src/qdoc/qdoc/tests/generatedoutput/expected_output/noautolist/testcpp-module.html +++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/noautolist/testcpp-module.html @@ -36,7 +36,7 @@ <li><a href="testcpp-module.html#section" translate="no">section()</a></li> <li><a href="testcpp-module.html#section" translate="no">section() is a section title</a></li> <li><a href="testqdoc-test.html#Test" translate="no">open( parenthesis</a></li> -<li><a href="https://en.cppreference.com/w/cpp/utility/move" translate="no">C++11 added std::move(T&& t)</a></li> +<li><a href="https://en.cppreference.com/w/cpp/utility/move">C++11 added std::move(T&& t)</a></li> </ul> <h4 id="section">section()</h4> </div> diff --git a/src/qdoc/qdoc/tests/generatedoutput/expected_output/testcpp-module.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/testcpp-module.html index 826926d59..83ab5b175 100644 --- a/src/qdoc/qdoc/tests/generatedoutput/expected_output/testcpp-module.html +++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/testcpp-module.html @@ -48,7 +48,7 @@ <li><a href="testcpp-module.html#section" translate="no">section()</a></li> <li><a href="testcpp-module.html#section" translate="no">section() is a section title</a></li> <li><a href="testqdoc-test.html#Test" translate="no">open( parenthesis</a></li> -<li><a href="https://en.cppreference.com/w/cpp/utility/move" translate="no">C++11 added std::move(T&& t)</a></li> +<li><a href="https://en.cppreference.com/w/cpp/utility/move">C++11 added std::move(T&& t)</a></li> </ul> <h4 id="section">section()</h4> </div> diff --git a/src/qdoc/qdoc/tests/generatedoutput/expected_output/testcpp/testcpp-module.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/testcpp/testcpp-module.html index 826926d59..83ab5b175 100644 --- a/src/qdoc/qdoc/tests/generatedoutput/expected_output/testcpp/testcpp-module.html +++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/testcpp/testcpp-module.html @@ -48,7 +48,7 @@ <li><a href="testcpp-module.html#section" translate="no">section()</a></li> <li><a href="testcpp-module.html#section" translate="no">section() is a section title</a></li> <li><a href="testqdoc-test.html#Test" translate="no">open( parenthesis</a></li> -<li><a href="https://en.cppreference.com/w/cpp/utility/move" translate="no">C++11 added std::move(T&& t)</a></li> +<li><a href="https://en.cppreference.com/w/cpp/utility/move">C++11 added std::move(T&& t)</a></li> </ul> <h4 id="section">section()</h4> </div> diff --git a/src/qdoc/qdoc/tests/generatedoutput/expected_output/testcpp/testqdoc-test.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/testcpp/testqdoc-test.html index 7a0e875f4..028339088 100644 --- a/src/qdoc/qdoc/tests/generatedoutput/expected_output/testcpp/testqdoc-test.html +++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/testcpp/testqdoc-test.html @@ -41,7 +41,7 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> <li><a href="testqdoc-test-obsolete.html">Deprecated members</a></li> <li>Test is part of <a href="cpptypes.html">Test C++ Types</a>.</li> </ul> -<p><b>Note:</b> All functions in this class are <a href="https://doc.qt.io/qt/17-qdoc-commands-thread.html#reentrant-command" translate="no">reentrant</a> with the following exceptions:</p> +<p><b>Note:</b> All functions in this class are <a href="https://doc.qt.io/qt/17-qdoc-commands-thread.html#reentrant-command">reentrant</a> with the following exceptions:</p> <ul> <li><a href="testqdoc-test.html#someFunctionDefaultArg" translate="no">someFunctionDefaultArg</a>(int i, bool b) const</li> </ul> @@ -132,7 +132,7 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> <!-- $$$someFunctionDefaultArg[overload1]$$$someFunctionDefaultArgintbool --> <h3 class="fn" translate="no" id="someFunctionDefaultArg"><span class="type">void</span> Test::<span class="name">someFunctionDefaultArg</span>(<span class="type">int</span> <i>i</i>, <span class="type">bool</span> <i>b</i> = false) const</h3> <p>Function that takes a parameter <i translate="no">i</i> and <i translate="no">b</i>.</p> -<p><b>Warning:</b> This function is not <a href="https://doc.qt.io/qt/17-qdoc-commands-thread.html#reentrant-command" translate="no">reentrant</a>.</p> +<p><b>Warning:</b> This function is not <a href="https://doc.qt.io/qt/17-qdoc-commands-thread.html#reentrant-command">reentrant</a>.</p> <!-- @@@someFunctionDefaultArg --> <!-- $$$virtualFun[overload1]$$$virtualFun --> <h3 class="fn" translate="no" id="virtualFun"><code class="details extra" translate="no">[virtual]</code> <span class="type">void</span> Test::<span class="name">virtualFun</span>()</h3> diff --git a/src/qdoc/qdoc/tests/generatedoutput/expected_output/testqdoc-test.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/testqdoc-test.html index 7a0e875f4..028339088 100644 --- a/src/qdoc/qdoc/tests/generatedoutput/expected_output/testqdoc-test.html +++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/testqdoc-test.html @@ -41,7 +41,7 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> <li><a href="testqdoc-test-obsolete.html">Deprecated members</a></li> <li>Test is part of <a href="cpptypes.html">Test C++ Types</a>.</li> </ul> -<p><b>Note:</b> All functions in this class are <a href="https://doc.qt.io/qt/17-qdoc-commands-thread.html#reentrant-command" translate="no">reentrant</a> with the following exceptions:</p> +<p><b>Note:</b> All functions in this class are <a href="https://doc.qt.io/qt/17-qdoc-commands-thread.html#reentrant-command">reentrant</a> with the following exceptions:</p> <ul> <li><a href="testqdoc-test.html#someFunctionDefaultArg" translate="no">someFunctionDefaultArg</a>(int i, bool b) const</li> </ul> @@ -132,7 +132,7 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> <!-- $$$someFunctionDefaultArg[overload1]$$$someFunctionDefaultArgintbool --> <h3 class="fn" translate="no" id="someFunctionDefaultArg"><span class="type">void</span> Test::<span class="name">someFunctionDefaultArg</span>(<span class="type">int</span> <i>i</i>, <span class="type">bool</span> <i>b</i> = false) const</h3> <p>Function that takes a parameter <i translate="no">i</i> and <i translate="no">b</i>.</p> -<p><b>Warning:</b> This function is not <a href="https://doc.qt.io/qt/17-qdoc-commands-thread.html#reentrant-command" translate="no">reentrant</a>.</p> +<p><b>Warning:</b> This function is not <a href="https://doc.qt.io/qt/17-qdoc-commands-thread.html#reentrant-command">reentrant</a>.</p> <!-- @@@someFunctionDefaultArg --> <!-- $$$virtualFun[overload1]$$$virtualFun --> <h3 class="fn" translate="no" id="virtualFun"><code class="details extra" translate="no">[virtual]</code> <span class="type">void</span> Test::<span class="name">virtualFun</span>()</h3> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/autolinking.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/autolinking.html index e486a78e1..ead0896fe 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/autolinking.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/autolinking.html @@ -19,7 +19,7 @@ <!-- $$$autolinking.html-description --> <div class="descr" id="details"> <h2 id="testqdoc">TestQDoc</h2> -<p>The string <a href="testqdoc.html" translate="no">TestQDoc</a> links to the C++ namespace unless linking explicitly, <a href="autolinking.html#testqdoc" translate="no">like this</a>, or <a href="testqdoc.html" translate="no">this</a>. Also,</p> +<p>The string <a href="testqdoc.html" translate="no">TestQDoc</a> links to the C++ namespace unless linking explicitly, <a href="autolinking.html#testqdoc">like this</a>, or <a href="testqdoc.html" translate="no">this</a>. Also,</p> <p>Autolinks:</p> <ul> <li><a href="testqdoc-testderived.html" translate="no">TestQDoc::TestDerived</a></li> @@ -27,7 +27,7 @@ <p>Explicit links:</p> <ul> <li><a href="testqdoc-testderived.html" translate="no">TestQDoc::TestDerived</a></li> -<li><a href="obsolete-classes.html#testqdoc" translate="no">Obsolete Classes#TestQDoc</a></li> +<li><a href="obsolete-classes.html#testqdoc">Obsolete Classes#TestQDoc</a></li> </ul> <h2 id="someprop">someProp</h2> </div> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-progressbar.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-progressbar.html index 2db9f91d7..b491e2eec 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-progressbar.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-progressbar.html @@ -39,7 +39,7 @@ <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" 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> +<p>This documentation is part of the <a href="test-componentset-example.html">UIComponents</a> example.</p> <!-- @@@ProgressBar --> <h2>Property Documentation</h2> <!-- $$$color --> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-switch.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-switch.html index 600c6c164..8e3917a21 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-switch.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-switch.html @@ -40,7 +40,7 @@ <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" 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> +<p>This documentation is part of the <a href="test-componentset-example.html">UIComponents</a> example.</p> <!-- @@@Switch --> <h2>Property Documentation</h2> <!-- $$$on --> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-tabwidget.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-tabwidget.html index 3a55163ff..466262eca 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-tabwidget.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-uicomponents-tabwidget.html @@ -37,7 +37,7 @@ <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" 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> +<p>This documentation is part of the <a href="test-componentset-example.html">UIComponents</a> example.</p> <h2 id="adding-tabs">Adding Tabs</h2> <p>To add a tab, declare the tab as a child of the TabWidget.</p> <pre class="cpp" translate="no"><span class="type"><a href="qml-uicomponents-tabwidget.html" translate="no">TabWidget</a></span> { diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testcpp-module.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testcpp-module.html index 52cebe971..828bfd508 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testcpp-module.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testcpp-module.html @@ -51,7 +51,7 @@ <li><a href="testcpp-module.html#section" translate="no">section()</a></li> <li><a href="testcpp-module.html#section" translate="no">section() is a section title</a></li> <li><a href="testqdoc-test.html#Test" translate="no">open( parenthesis</a></li> -<li><a href="https://en.cppreference.com/w/cpp/utility/move" translate="no">C++11 added std::move(T&& t)</a></li> +<li><a href="https://en.cppreference.com/w/cpp/utility/move">C++11 added std::move(T&& t)</a></li> </ul> <h4 id="section">section()</h4> </div> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-test.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-test.html index abfd03371..a0d26af3f 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-test.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-test.html @@ -42,7 +42,7 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> <li><a href="testqdoc-test-obsolete.html">Deprecated members</a></li> <li>Test is part of <a href="cpptypes.html">Test C++ Types</a>.</li> </ul> -<p><b>Note:</b> All functions in this class are <a href="https://doc.qt.io/qt/17-qdoc-commands-thread.html#reentrant-command" translate="no">reentrant</a> with the following exceptions:</p> +<p><b>Note:</b> All functions in this class are <a href="https://doc.qt.io/qt/17-qdoc-commands-thread.html#reentrant-command">reentrant</a> with the following exceptions:</p> <ul> <li><a href="testqdoc-test.html#someFunctionDefaultArg" translate="no">someFunctionDefaultArg</a>(int i, bool b) const</li> </ul> @@ -134,7 +134,7 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> <!-- $$$someFunctionDefaultArg[overload1]$$$someFunctionDefaultArgintbool --> <h3 class="fn" translate="no" id="someFunctionDefaultArg"><code class="details extra" translate="no">[since 2.0]</code> <span class="type">void</span> Test::<span class="name">someFunctionDefaultArg</span>(<span class="type">int</span> <i>i</i>, <span class="type">bool</span> <i>b</i> = false) const</h3> <p>Function that takes a parameter <i translate="no">i</i> and <i translate="no">b</i>.</p> -<p><b>Warning:</b> This function is not <a href="https://doc.qt.io/qt/17-qdoc-commands-thread.html#reentrant-command" translate="no">reentrant</a>.</p> +<p><b>Warning:</b> This function is not <a href="https://doc.qt.io/qt/17-qdoc-commands-thread.html#reentrant-command">reentrant</a>.</p> <p>This function was introduced in Qt 2.0.</p> <!-- @@@someFunctionDefaultArg --> <!-- $$$virtualFun[overload1]$$$virtualFun --> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-testderived.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-testderived.html index 9fb47d89a..e443aca0a 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-testderived.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-testderived.html @@ -105,7 +105,7 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> <h2>Property Documentation</h2> <!-- $$$bindableProp-prop$$$bindableProp$$$setBindablePropconstQString&$$$bindablePropChanged --> <h3 class="fn" translate="no" id="bindableProp-prop"><code class="details extra" translate="no">[bindable]</code> <span class="name">bindableProp</span> : <span class="type">QString</span></h3> -<div class="admonition note"><p><b>Note: </b>This property supports <a href="https://wiki.qt.io/QProperty" translate="no">QProperty</a> bindings.</p> +<div class="admonition note"><p><b>Note: </b>This property supports <a href="https://wiki.qt.io/QProperty">QProperty</a> bindings.</p> </div><p>Some property.</p> <p><b>See also </b><a href="testqdoc-testderived.html#someProp-prop" translate="no">someProp</a>.</p> <!-- @@@bindableProp --> @@ -141,7 +141,7 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> <!-- @@@name --> <!-- $$$someProp-prop$$$someProp --> <h3 class="fn" translate="no" id="someProp-prop"><code class="details extra" translate="no">[bindable read-only]</code> <span class="name">someProp</span> : <span class="type">QString</span></h3> -<div class="admonition note"><p><b>Note: </b>This property supports <a href="https://wiki.qt.io/QProperty" translate="no">QProperty</a> bindings.</p> +<div class="admonition note"><p><b>Note: </b>This property supports <a href="https://wiki.qt.io/QProperty">QProperty</a> bindings.</p> </div><p>Another property.</p> <!-- @@@someProp --> </div> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/uicomponents-qmlmodule.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/uicomponents-qmlmodule.html index 0b7e08864..e45470a92 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/uicomponents-qmlmodule.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/uicomponents-qmlmodule.html @@ -12,7 +12,7 @@ <!-- $$$UIComponents-description --> <div class="descr" id="details"> <p>This is a listing of a list of UI components implemented by QML types. These files are available for general import and they are based on the Qt Quick Code Samples.</p> -<p>This module is part of the <a href="test-componentset-example.html" translate="no">UIComponents</a> example.</p> +<p>This module is part of the <a href="test-componentset-example.html">UIComponents</a> example.</p> </div> <!-- @@@UIComponents --> <div class="table"><table class="annotated"> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/headerfile/expected/html/testheader.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/headerfile/expected/html/testheader.html index 9952a0fb3..a728ddd12 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/headerfile/expected/html/testheader.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/headerfile/expected/html/testheader.html @@ -7,7 +7,7 @@ <title><TestHeader> - Test Header | HeaderFile</title> </head> <body> -<li><a href="headers.html" translate="no">Headers</a></li> +<li><a href="headers.html">Headers</a></li> <li><TestHeader> - Test Header</li> <div class="sidebar"> <div class="toc"> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/html/brief-adventures.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/html/brief-adventures.html index 009104a6f..1600b124c 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/html/brief-adventures.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/html/brief-adventures.html @@ -20,7 +20,7 @@ <div class="descr" id="details"> <p>The purpose of this test data is to provide a regression mechanism as part of QDoc's end-to-end test, tst_generatedOutput, for an issue (QTBUG-70959) that was reported against QDoc's \keyword command. The issue, as experienced by the reporter of the bug, is that if the \keyword command isn't followed by a new command, or is the last command in a paragraph, the following paragraph is "eaten". That means the entire paragraph is understood by QDoc as keywords and included as html meta information instead of as part of the rendered output.</p> <h2 id="further-details">Further details</h2> -<p>The bug report is at <a href="https://bugreports.qt.io/browse/QTBUG-70959" translate="no">https://bugreports.qt.io/browse/QTBUG-70959</a>. It refers to a change that bypassed the issue by moving the \keyword command, at <a href="https://codereview.qt-project.org/c/qt/qtdoc/+/242033/" translate="no">https://codereview.qt-project.org/c/qt/qtdoc/+/242033/</a>.</p> +<p>The bug report is at <a href="https://bugreports.qt.io/browse/QTBUG-70959">https://bugreports.qt.io/browse/QTBUG-70959</a>. It refers to a change that bypassed the issue by moving the \keyword command, at <a href="https://codereview.qt-project.org/c/qt/qtdoc/+/242033/">https://codereview.qt-project.org/c/qt/qtdoc/+/242033/</a>.</p> </div> <!-- @@@brief-adventures.html --> </body> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/line_comments/expected/html/a-page-with-a-line-comment-in-the-see-also-command.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/line_comments/expected/html/a-page-with-a-line-comment-in-the-see-also-command.html index 27ba4c2a3..a7b95776d 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/line_comments/expected/html/a-page-with-a-line-comment-in-the-see-also-command.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/line_comments/expected/html/a-page-with-a-line-comment-in-the-see-also-command.html @@ -12,7 +12,7 @@ <div class="descr" id="details"> <p>QDoc's \sa command doesn't respect QDoc's line comments.</p> </div> -<p><b>See also </b><a href="another-page-with-an-image-at-the-top.html" translate="no">This page starts with an image</a> and <a href="line-comment-adventures.html" translate="no">Adventures with QDoc's line comments</a>.</p> +<p><b>See also </b><a href="another-page-with-an-image-at-the-top.html">This page starts with an image</a> and <a href="line-comment-adventures.html">Adventures with QDoc's line comments</a>.</p> <!-- @@@a-page-with-a-line-comment-in-the-see-also-command.html --> </body> </html> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/line_comments/expected/html/line-comment-adventures.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/line_comments/expected/html/line-comment-adventures.html index 1b1ab281c..89ab9e527 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/line_comments/expected/html/line-comment-adventures.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/line_comments/expected/html/line-comment-adventures.html @@ -20,7 +20,7 @@ <div class="descr" id="details"> <p>The purpose of this test data is to provide a regression mechanism as part of QDoc's end-to-end test, tst_generatedOutput, for an issue (QTBUG-105754) that was reported against QDoc's \sa command. The issue, as experienced by the reporter of the bug, is that if the \sa command is followed by a line comment, QDoc generates a series of "Missing comma in \sa" warnings.</p> <h2 id="further-details">Further details</h2> -<p>The bug report is at <a href="https://bugreports.qt.io/browse/QTBUG-105754" translate="no">https://bugreports.qt.io/browse/QTBUG-105754</a>.</p> +<p>The bug report is at <a href="https://bugreports.qt.io/browse/QTBUG-105754">https://bugreports.qt.io/browse/QTBUG-105754</a>.</p> </div> <!-- @@@line-comment-adventures.html --> </body> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/non_ascii_character_input/expected/adventures-with-non-ascii-characters.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/non_ascii_character_input/expected/adventures-with-non-ascii-characters.html index 4eeb77a6d..9552c867f 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/non_ascii_character_input/expected/adventures-with-non-ascii-characters.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/non_ascii_character_input/expected/adventures-with-non-ascii-characters.html @@ -37,7 +37,7 @@ <p>The reporter states that this link doesn't work, presumably because it begins with the Chinese character "属".</p> <p>这就是属性视图</p> <h2 id="further-details">Further details</h2> -<p>The bug report is at <a href="https://bugreports.qt.io/browse/QTBUG-64506" translate="no">https://bugreports.qt.io/browse/QTBUG-64506</a>. It contains the content used to trigger the behavior in this test case. The Chinese characters are copied verbatim from the report.</p> +<p>The bug report is at <a href="https://bugreports.qt.io/browse/QTBUG-64506">https://bugreports.qt.io/browse/QTBUG-64506</a>. It contains the content used to trigger the behavior in this test case. The Chinese characters are copied verbatim from the report.</p> <h3 id="ascii-characters-that-are-non-printable-ascii-such-as-or-521d09f0">Ascii characters that are non-printable ascii, such as ß, ü, or ø</h3> <p>A whole range of ascii characters are not printable ascii characters. These could also cause issues for QDoc. This section is here to confirm linking to such section titles works as expected. It's made a section2 to exercise the behavior for other section levels than 1.</p> </div> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/expected/html/qdoctests-qdocfileoutput.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/expected/html/qdoctests-qdocfileoutput.html index 74570305c..a38d4e3b4 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/expected/html/qdoctests-qdocfileoutput.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/expected/html/qdoctests-qdocfileoutput.html @@ -46,14 +46,14 @@ <h2 id="linking">Linking</h2> <p>There are multiple ways to create hyperlinks to other topics:</p> <ul> -<li><a href="qdoctests-qdocfileoutput-linking.html" 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> +<li><a href="qdoctests-qdocfileoutput-linking.html">Linking to a page title</a></li> +<li><a href="qdoctests-qdocfileoutput-linking.html#link-targets">Linking to a section title</a></li> +<li><a href="qdoctests-qdocfileoutput-linking.html#link-test-target">Linking using a \target string</a></li> +<li><a href="qdoctests-qdocfileoutput-linking.html">Linking using a \keyword string</a></li> </ul> <h2 id="qdoc-linking-test">QDoc Linking Test</h2> <p>This section title is overridden by another target which takes precedence.</p> -<h2 id="linking-to-something-in-a-section-title">Linking to <a href="qdoctests-qdocfileoutput.html#further-information" translate="no">something</a> in a section title</h2> +<h2 id="linking-to-something-in-a-section-title">Linking to <a href="qdoctests-qdocfileoutput.html#further-information">something</a> in a section title</h2> <p>This is allowed but a questionable practice.</p> <details> <summary>QDoc details</summary> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/expected/html/toc.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/expected/html/toc.html index 5901538d0..f34ce0db6 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/expected/html/toc.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/expected/html/toc.html @@ -16,9 +16,9 @@ <!-- $$$toc.html-description --> <div class="descr" id="details"> <ul> -<li><a href="qdoctests-qdocfileoutput.html" translate="no">QDoc Testing</a></li> -<li><a href="qdoctests-qdocfileoutput-linking.html" translate="no">QDoc Linking Test</a></li> -<li><a href="toc.html" translate="no">Table of Contents</a></li> +<li><a href="qdoctests-qdocfileoutput.html">QDoc Testing</a></li> +<li><a href="qdoctests-qdocfileoutput-linking.html">QDoc Linking Test</a></li> +<li><a href="toc.html">Table of Contents</a></li> </ul> </div> <!-- @@@toc.html --> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/expected/html/autolinking.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/expected/html/autolinking.html index 444c3d0d1..ac04c33cd 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/expected/html/autolinking.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/expected/html/autolinking.html @@ -19,7 +19,7 @@ <!-- $$$autolinking.html-description --> <div class="descr" id="details"> <h2 id="testqdoc">TestQDoc</h2> -<p>The string <a href="testqdoc.html" translate="no">TestQDoc</a> links to the C++ namespace unless linking explicitly, <a href="autolinking.html#testqdoc" translate="no">like this</a>, or <a href="testqdoc.html" translate="no">this</a>. Also,</p> +<p>The string <a href="testqdoc.html" translate="no">TestQDoc</a> links to the C++ namespace unless linking explicitly, <a href="autolinking.html#testqdoc">like this</a>, or <a href="testqdoc.html" translate="no">this</a>. Also,</p> <p>Autolinks:</p> <ul> <li><a href="testqdoc-testderived.html" translate="no">TestQDoc::TestDerived</a></li> @@ -27,7 +27,7 @@ <p>Explicit links:</p> <ul> <li><a href="testqdoc-testderived.html" translate="no">TestQDoc::TestDerived</a></li> -<li><a href="obsolete-classes.html#testqdoc" translate="no">Obsolete Classes#TestQDoc</a></li> +<li><a href="obsolete-classes.html#testqdoc">Obsolete Classes#TestQDoc</a></li> </ul> <h2 id="someprop">someProp</h2> </div> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/expected/html/testcpp-module.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/expected/html/testcpp-module.html index 826926d59..83ab5b175 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/expected/html/testcpp-module.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/expected/html/testcpp-module.html @@ -48,7 +48,7 @@ <li><a href="testcpp-module.html#section" translate="no">section()</a></li> <li><a href="testcpp-module.html#section" translate="no">section() is a section title</a></li> <li><a href="testqdoc-test.html#Test" translate="no">open( parenthesis</a></li> -<li><a href="https://en.cppreference.com/w/cpp/utility/move" translate="no">C++11 added std::move(T&& t)</a></li> +<li><a href="https://en.cppreference.com/w/cpp/utility/move">C++11 added std::move(T&& t)</a></li> </ul> <h4 id="section">section()</h4> </div> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/expected/html/testqdoc-test.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/expected/html/testqdoc-test.html index b1efd4d91..19038e75c 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/expected/html/testqdoc-test.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/expected/html/testqdoc-test.html @@ -41,7 +41,7 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> <li><a href="testqdoc-test-obsolete.html">Deprecated members</a></li> <li>Test is part of <a href="cpptypes.html">Test C++ Types</a>.</li> </ul> -<p><b>Note:</b> All functions in this class are <a href="https://doc.qt.io/qt/17-qdoc-commands-thread.html#reentrant-command" translate="no">reentrant</a> with the following exceptions:</p> +<p><b>Note:</b> All functions in this class are <a href="https://doc.qt.io/qt/17-qdoc-commands-thread.html#reentrant-command">reentrant</a> with the following exceptions:</p> <ul> <li><a href="testqdoc-test.html#someFunctionDefaultArg" translate="no">someFunctionDefaultArg</a>(int i, bool b) const</li> </ul> @@ -153,7 +153,7 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> <!-- $$$someFunctionDefaultArg[overload1]$$$someFunctionDefaultArgintbool --> <h3 class="fn" translate="no" id="someFunctionDefaultArg"><span class="type">void</span> Test::<span class="name">someFunctionDefaultArg</span>(<span class="type">int</span> <i>i</i>, <span class="type">bool</span> <i>b</i> = false) const</h3> <p>Function that takes a parameter <i translate="no">i</i> and <i translate="no">b</i>.</p> -<p><b>Warning:</b> This function is not <a href="https://doc.qt.io/qt/17-qdoc-commands-thread.html#reentrant-command" translate="no">reentrant</a>.</p> +<p><b>Warning:</b> This function is not <a href="https://doc.qt.io/qt/17-qdoc-commands-thread.html#reentrant-command">reentrant</a>.</p> <!-- @@@someFunctionDefaultArg --> <!-- $$$virtualFun[overload1]$$$virtualFun --> <h3 class="fn" translate="no" id="virtualFun"><code class="details extra" translate="no">[virtual]</code> <span class="type">void</span> Test::<span class="name">virtualFun</span>()</h3> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/expected/html/autolinking.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/expected/html/autolinking.html index c5c8511d7..689afdfb9 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/expected/html/autolinking.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/expected/html/autolinking.html @@ -19,7 +19,7 @@ <!-- $$$autolinking.html-description --> <div class="descr" id="details"> <h2 id="testqdoc">TestQDoc</h2> -<p>The string <a href="testqdoc.html" translate="no">TestQDoc</a> links to the C++ namespace unless linking explicitly, <a href="autolinking.html#testqdoc" translate="no">like this</a>, or <a href="testqdoc.html" translate="no">this</a>. Also,</p> +<p>The string <a href="testqdoc.html" translate="no">TestQDoc</a> links to the C++ namespace unless linking explicitly, <a href="autolinking.html#testqdoc">like this</a>, or <a href="testqdoc.html" translate="no">this</a>. Also,</p> <p>Autolinks:</p> <ul> <li><a href="testqdoc-testderived.html" translate="no">TestQDoc::TestDerived</a></li> @@ -27,7 +27,7 @@ <p>Explicit links:</p> <ul> <li><a href="testqdoc-testderived.html" translate="no">TestQDoc::TestDerived</a></li> -<li><a href="obsolete-classes.html#testqdoc" translate="no">Obsolete Classes#TestQDoc</a></li> +<li><a href="obsolete-classes.html#testqdoc">Obsolete Classes#TestQDoc</a></li> </ul> <h2 id="someprop">someProp</h2> </div> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/expected/html/testcpp-module.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/expected/html/testcpp-module.html index 77f0d130d..6ac7d9b42 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/expected/html/testcpp-module.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/expected/html/testcpp-module.html @@ -53,7 +53,7 @@ <li><a href="testcpp-module.html#section" translate="no">section()</a></li> <li><a href="testcpp-module.html#section" translate="no">section() is a section title</a></li> <li><a href="testqdoc-test.html#Test" translate="no">open( parenthesis</a></li> -<li><a href="https://en.cppreference.com/w/cpp/utility/move" translate="no">C++11 added std::move(T&& t)</a></li> +<li><a href="https://en.cppreference.com/w/cpp/utility/move">C++11 added std::move(T&& t)</a></li> </ul> <h4 id="section">section()</h4> </div> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/expected/html/testqdoc-test.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/expected/html/testqdoc-test.html index b2eae64e4..93c164ae0 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/expected/html/testqdoc-test.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/expected/html/testqdoc-test.html @@ -41,7 +41,7 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> <li><a href="testqdoc-test-obsolete.html">Deprecated members</a></li> <li>Test is part of <a href="cpptypes.html">Test C++ Types</a>.</li> </ul> -<p><b>Note:</b> All functions in this class are <a href="https://doc.qt.io/qt/17-qdoc-commands-thread.html#reentrant-command" translate="no">reentrant</a> with the following exceptions:</p> +<p><b>Note:</b> All functions in this class are <a href="https://doc.qt.io/qt/17-qdoc-commands-thread.html#reentrant-command">reentrant</a> with the following exceptions:</p> <ul> <li><a href="testqdoc-test.html#someFunctionDefaultArg" translate="no">someFunctionDefaultArg</a>(int i, bool b) const</li> </ul> @@ -143,7 +143,7 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> <!-- $$$someFunctionDefaultArg[overload1]$$$someFunctionDefaultArgintbool --> <h3 class="fn" translate="no" id="someFunctionDefaultArg"><span class="type">void</span> Test::<span class="name">someFunctionDefaultArg</span>(<span class="type">int</span> <i>i</i>, <span class="type">bool</span> <i>b</i> = false) const</h3> <p>Function that takes a parameter <i translate="no">i</i> and <i translate="no">b</i>.</p> -<p><b>Warning:</b> This function is not <a href="https://doc.qt.io/qt/17-qdoc-commands-thread.html#reentrant-command" translate="no">reentrant</a>.</p> +<p><b>Warning:</b> This function is not <a href="https://doc.qt.io/qt/17-qdoc-commands-thread.html#reentrant-command">reentrant</a>.</p> <!-- @@@someFunctionDefaultArg --> <!-- $$$virtualFun[overload1]$$$virtualFun --> <h3 class="fn" translate="no" id="virtualFun"><code class="details extra" translate="no">[virtual]</code> <span class="type">void</span> Test::<span class="name">virtualFun</span>()</h3> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/expected/html/qdoctests-qdocfileoutput-exhaustive.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/expected/html/qdoctests-qdocfileoutput-exhaustive.html index ce9c0419f..4c707b186 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/expected/html/qdoctests-qdocfileoutput-exhaustive.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/expected/html/qdoctests-qdocfileoutput-exhaustive.html @@ -7,8 +7,8 @@ <title>Exhaustive testing of QDoc commands | OutputFromQDocFiles</title> </head> <body> -<li><a href="toc-test.html" translate="no">TOC</a></li> -<li><a href="qdoctests-qdocfileoutput.html" translate="no">Testing QDoc output from .qdoc files</a></li> +<li><a href="toc-test.html">TOC</a></li> +<li><a href="qdoctests-qdocfileoutput.html">Testing QDoc output from .qdoc files</a></li> <li>Exhaustive testing of QDoc commands</li> <li id="buildversion">OutputFromQDocFiles - A test project for QDoc build artifacts</li> <link rel="prev" href="qdoctests-qdocfileoutput.html" /> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/expected/html/qdoctests-qdocfileoutput-linking.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/expected/html/qdoctests-qdocfileoutput-linking.html index 4b50d9ee2..137707017 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/expected/html/qdoctests-qdocfileoutput-linking.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/expected/html/qdoctests-qdocfileoutput-linking.html @@ -7,7 +7,7 @@ <title>Testing QDoc's link command | OutputFromQDocFiles</title> </head> <body> -<li><a href="toc-test.html" translate="no">TOC</a></li> +<li><a href="toc-test.html">TOC</a></li> <li>Testing QDoc's link command</li> <li id="buildversion">OutputFromQDocFiles - A test project for QDoc build artifacts</li> <link rel="prev" href="qdoctests-qdocfileoutput-exhaustive.html" /> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/expected/html/qdoctests-qdocfileoutput.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/expected/html/qdoctests-qdocfileoutput.html index cbb55db2e..9b7578fc3 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/expected/html/qdoctests-qdocfileoutput.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/expected/html/qdoctests-qdocfileoutput.html @@ -7,7 +7,7 @@ <title>Testing QDoc output from .qdoc files | OutputFromQDocFiles</title> </head> <body> -<li><a href="toc-test.html" translate="no">TOC</a></li> +<li><a href="toc-test.html">TOC</a></li> <li>Testing QDoc output from .qdoc files</li> <li id="buildversion">OutputFromQDocFiles - A test project for QDoc build artifacts</li> <link rel="next" href="qdoctests-qdocfileoutput-exhaustive.html" /> @@ -48,14 +48,14 @@ <h2 id="linking">Linking</h2> <p>There are multiple ways to create hyperlinks to other topics:</p> <ul> -<li><a href="qdoctests-qdocfileoutput-linking.html" 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> +<li><a href="qdoctests-qdocfileoutput-linking.html">Linking to a page title</a></li> +<li><a href="qdoctests-qdocfileoutput-linking.html#link-targets">Linking to a section title</a></li> +<li><a href="qdoctests-qdocfileoutput-linking.html#link-test-target">Linking using a \target string</a></li> +<li><a href="qdoctests-qdocfileoutput-linking.html">Linking using a \keyword string</a></li> </ul> <h2 id="qdoc-linking-test">QDoc Linking Test</h2> <p>This section title is overridden by another target which takes precedence.</p> -<h2 id="linking-to-something-in-a-section-title">Linking to <a href="qdoctests-qdocfileoutput.html#further-information" translate="no">something</a> in a section title</h2> +<h2 id="linking-to-something-in-a-section-title">Linking to <a href="qdoctests-qdocfileoutput.html#further-information">something</a> in a section title</h2> <p>This is allowed but a questionable practice.</p> <details> <summary>QDoc details</summary> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/expected/html/toc-test.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/expected/html/toc-test.html index 519109bc9..08ec52c10 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/expected/html/toc-test.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/expected/html/toc-test.html @@ -12,17 +12,17 @@ <!-- $$$toc-test.html-description --> <div class="descr" id="details"> <ul> -<li><a href="qdoctests-qdocfileoutput.html" translate="no">QDoc Testing</a><ul> -<li><a href="qdoctests-qdocfileoutput-exhaustive.html" translate="no">Exhaustive testing of QDoc commands</a></li> +<li><a href="qdoctests-qdocfileoutput.html">QDoc Testing</a><ul> +<li><a href="qdoctests-qdocfileoutput-exhaustive.html">Exhaustive testing of QDoc commands</a></li> </ul> </li> <li>Linking<ul> -<li><a href="qdoctests-qdocfileoutput-linking.html" translate="no">QDoc Linking Test</a><ul> -<li><a href="qdoctests-qdocfileoutput-linking.html#link-targets" translate="no">Link targets</a></li> +<li><a href="qdoctests-qdocfileoutput-linking.html">QDoc Linking Test</a><ul> +<li><a href="qdoctests-qdocfileoutput-linking.html#link-targets">Link targets</a></li> </ul> </li> -<li><a href="crash.html" translate="no">Random page</a></li> -<li><a href="toc.html" translate="no">Table of Contents</a></li> +<li><a href="crash.html">Random page</a></li> +<li><a href="toc.html">Table of Contents</a></li> </ul> </li> </ul> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/expected/html/toc.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/expected/html/toc.html index d6f423f49..d7220d013 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/expected/html/toc.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/expected/html/toc.html @@ -6,7 +6,7 @@ <title>Table of Contents | OutputFromQDocFiles</title> </head> <body> -<li><a href="toc-test.html" translate="no">TOC</a></li> +<li><a href="toc-test.html">TOC</a></li> <li>Table of Contents</li> <li id="buildversion">OutputFromQDocFiles - A test project for QDoc build artifacts</li> <link rel="prev" href="" /> @@ -18,9 +18,9 @@ <!-- $$$toc.html-description --> <div class="descr" id="details"> <ul> -<li><a href="qdoctests-qdocfileoutput.html" translate="no">QDoc Testing</a></li> -<li><a href="qdoctests-qdocfileoutput-linking.html" translate="no">QDoc Linking Test</a></li> -<li><a href="toc.html" translate="no">Table of Contents</a></li> +<li><a href="qdoctests-qdocfileoutput.html">QDoc Testing</a></li> +<li><a href="qdoctests-qdocfileoutput-linking.html">QDoc Linking Test</a></li> +<li><a href="toc.html">Table of Contents</a></li> </ul> </div> <!-- @@@toc.html --> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/trademark_command/expected/html/trademarks.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/trademark_command/expected/html/trademarks.html index 0626c6ac9..475d760ed 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/trademark_command/expected/html/trademarks.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/trademark_command/expected/html/trademarks.html @@ -12,7 +12,7 @@ <!-- $$$trademarks.html-description --> <div class="descr" id="details"> <ul> -<li><a href="trademark-test.html#acme-corp" translate="no">Acme corp</a>.</li> +<li><a href="trademark-test.html#acme-corp">Acme corp</a>.</li> </ul> <p>Foo™ should have the trademark symbol but no link as we're already on the correct page.</p> </div> |