diff options
Diffstat (limited to 'tests/auto/qdoc/generatedoutput')
6 files changed, 20 insertions, 5 deletions
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput-exhaustive.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput-exhaustive.xml index af2fdd955..7d9ed16f0 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput-exhaustive.xml +++ b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput-exhaustive.xml @@ -57,7 +57,9 @@ <db:note> <db:para>The code above doesn't compile</db:para> </db:note> -<db:para><db:emphasis role="bold">Warning:</db:emphasis> The following commands have yet to be tested: footnote link sincelist header index topicref // or just don’t care, remove it image inlineimage printline printto printuntil // what’s the difference between printto and printuntil??? quotefile quotefromfile quotefunction skipline skipto skipuntil span snippet codeline overload sub sup tableofcontents tt uicontrol endmapref endomit underline unicode</db:para> +<db:warning> +<db:para>The following commands have yet to be tested: footnote link sincelist header index topicref // or just don’t care, remove it image inlineimage printline printto printuntil // what’s the difference between printto and printuntil??? quotefile quotefromfile quotefunction skipline skipto skipuntil span snippet codeline overload sub sup tableofcontents tt uicontrol endmapref endomit underline unicode</db:para> +</db:warning> </db:section> </db:section> </db:section> 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 f3de1542a..4bc14d345 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/nestedmacro/testcpp-module.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/nestedmacro/testcpp-module.html @@ -33,7 +33,9 @@ <!-- $$$TestCPP-description --> <div class="descr"> <h2 id="details">Detailed Description</h2> +<div class="admonition note"> <p><b>Note: </b>This is just a test.</p> +</div> <p><b>This module was introduced in version 5.15.</b></p> </div> <!-- @@@TestCPP --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/testcpp-module.html b/tests/auto/qdoc/generatedoutput/expected_output/noautolist/testcpp-module.html index fd5beda6d..6db15ca22 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/testcpp-module.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/noautolist/testcpp-module.html @@ -21,8 +21,10 @@ <!-- $$$TestCPP-description --> <div class="descr"> <h2 id="details">Detailed Description</h2> +<div class="admonition note"> <p><b>Note: </b>This is just a test.</p> </div> +</div> <!-- @@@TestCPP --> </body> </html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-exhaustive.html b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-exhaustive.html index 508c12398..cbf7d6894 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-exhaustive.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-exhaustive.html @@ -42,13 +42,20 @@ <tr valign="top" class="odd"><td >Table item in a table row</td></tr> <tr valign="top" class="even"><td >Another item in a different row</td></tr> </table></div> -<p><b>Important: </b>This is really important.</p><p>For example, if you have code like</p> +<div class="admonition important"> +<p><b>Important: </b>This is really important.</p> +</div> +<p>For example, if you have code like</p> <pre class="cpp plain">This is old code.</pre> <p>you can rewrite it as</p> <pre class="cpp">This is <span class="keyword">new</span> and shiny<span class="operator">!</span></pre> +<div class="admonition note"> <p><b>Note: </b>The code above doesn't compile</p> +</div> <hr /> -<p><b>Warning:</b> The following commands have yet to be tested: footnote link sincelist header index topicref // or just don’t care, remove it image inlineimage printline printto printuntil // what’s the difference between printto and printuntil??? quotefile quotefromfile quotefunction skipline skipto skipuntil span snippet codeline overload sub sup tableofcontents tt uicontrol endmapref endomit underline unicode</p> +<div class="admonition warning"> +<p><b>Warning: </b>The following commands have yet to be tested: footnote link sincelist header index topicref // or just don’t care, remove it image inlineimage printline printto printuntil // what’s the difference between printto and printuntil??? quotefile quotefromfile quotefunction skipline skipto skipuntil span snippet codeline overload sub sup tableofcontents tt uicontrol endmapref endomit underline unicode</p> +</div> </div> <!-- @@@qdoctests-qdocfileoutput-exhaustive.html --> </body> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html b/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html index 117f34d72..04bd8e487 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html @@ -33,8 +33,10 @@ <!-- $$$TestCPP-description --> <div class="descr"> <h2 id="details">Detailed Description</h2> +<div class="admonition note"> <p><b>Note: </b>This is just a test.</p> </div> +</div> <!-- @@@TestCPP --> </body> </html> diff --git a/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp b/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp index 7473546b9..ccb131222 100644 --- a/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp +++ b/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp @@ -105,8 +105,8 @@ void tst_generatedOutput::initTestCase() // Resolve the path to the file containing extra parameters m_extraParams = QFileInfo(QTest::currentAppName()).dir().filePath("qdocincludepaths.inc"); if (!QFileInfo::exists(m_extraParams)) { - const QString warningMessage = "Cannot locate " + m_extraParams; - qWarning(qPrintable(warningMessage)); + qWarning().nospace() << QStringLiteral("Cannot locate") + << qUtf8Printable(m_extraParams); m_extraParams.clear(); } else { m_extraParams.insert(0, '@'); |