diff options
9 files changed, 41 insertions, 3 deletions
diff --git a/src/qdoc/qdoc/docparser.cpp b/src/qdoc/qdoc/docparser.cpp index 0d4383f67..f0607945a 100644 --- a/src/qdoc/qdoc/docparser.cpp +++ b/src/qdoc/qdoc/docparser.cpp @@ -544,6 +544,7 @@ void DocParser::parse(const QString &source, DocPrivate *docPrivate, append(Atom::AnnotatedList, getArgument()); break; case CMD_SINCELIST: + leavePara(); append(Atom::SinceList, getRestOfLine().simplified()); break; case CMD_GENERATELIST: { @@ -750,6 +751,7 @@ void DocParser::parse(const QString &source, DocPrivate *docPrivate, getUntilEnd(cmd); break; case CMD_OMITVALUE: { + leavePara(); p1 = getArgument(); if (!m_private->m_enumItemList.contains(p1)) m_private->m_enumItemList.append(p1); diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/illformatteddocumentation.index b/tests/auto/qdoc/generatedoutput/expected_output/html/illformatteddocumentation.index index 8acd9baa2..96db721b1 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/html/illformatteddocumentation.index +++ b/tests/auto/qdoc/generatedoutput/expected_output/html/illformatteddocumentation.index @@ -11,6 +11,7 @@ <contents name="qml-examples" title="QML Examples" level="1"/> <contents name="c-examples" title="C++ Examples" level="1"/> </page> + <page name="page-with-an-image-at-the-top.html" href="page-with-an-image-at-the-top.html" status="active" location="brief_adventures.qdoc" documented="true" subtype="page" title="This page starts with an image" fulltitle="This page starts with an image" subtitle="" brief="This page has an image right at the top"/> <group name="all-examples" href="all-examples.html" status="internal" seen="false" title=""/> <group name="illformatted-examples-qml" href="illformatted-examples-qml.html" status="internal" seen="false" title=""/> <module name="sometestgroup" href="sometestgroup-module.html" status="internal" seen="false" title=""/> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/page-with-an-image-at-the-top.html b/tests/auto/qdoc/generatedoutput/expected_output/page-with-an-image-at-the-top.html new file mode 100644 index 000000000..5675558f4 --- /dev/null +++ b/tests/auto/qdoc/generatedoutput/expected_output/page-with-an-image-at-the-top.html @@ -0,0 +1,19 @@ +<!DOCTYPE html> +<html lang="en"> +<head> + <meta charset="utf-8"> +<!-- brief_adventures.qdoc --> + <meta name="description" content="This page has an image right at the top."> + <title>This page starts with an image | IllformattedDocumentation</title> +</head> +<body> +<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> +<h1 class="title">This page starts with an image</h1> +<!-- $$$page-with-an-image-at-the-top.html-description --> +<div class="descr" id="details"> +<p class="centerAlign"><img src="images/leonardo-da-vinci.png" alt="This is the alternate text for the image" /></p><p>The image should render as expected, and the alternate text should be there, too. This text is contained in its own paragraph following the image.</p> +<p>This paragraph is a new paragraph, and doesn't contain an image.</p> +</div> +<!-- @@@page-with-an-image-at-the-top.html --> +</body> +</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum-docbook/testqdoc-test.xml b/tests/auto/qdoc/generatedoutput/expected_output/scopedenum-docbook/testqdoc-test.xml index 4710a4cf5..81c003fe9 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum-docbook/testqdoc-test.xml +++ b/tests/auto/qdoc/generatedoutput/expected_output/scopedenum-docbook/testqdoc-test.xml @@ -91,6 +91,7 @@ </db:section> <db:section xml:id="ScopedEnum-enum"> <db:title>enum Test::ScopedEnum</db:title> +<db:para>This enum has a brief to trigger a bug in CMD_BRIEF.</db:para> <db:informaltable> <db:thead> <db:tr> 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 c6f837f78..05a3dea20 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html @@ -90,6 +90,7 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)</td></tr> <!-- @@@ClassicEnum --> <!-- $$$ScopedEnum$$$This$$$That$$$All$$$OmittedValue$$$UselessValue$$$VeryLastValue --> <h3 class="fn" translate="no" id="ScopedEnum-enum">enum class Test::<span class="name">ScopedEnum</span></h3> +<p>This enum has a brief to trigger a bug in CMD_BRIEF.</p> <div class="table"><table class="valuelist"><tr valign="top" class="odd"><th class="tblConst">Constant</th><th class="tblval">Value</th><th class="tbldscr">Description</th></tr> <tr><td class="topAlign"><code translate="no">TestQDoc::Test::ScopedEnum::This</code></td><td class="topAlign tblval"><code translate="no">0x01</code></td><td class="topAlign">Something</td></tr> <tr><td class="topAlign"><code translate="no">TestQDoc::Test::ScopedEnum::That</code></td><td class="topAlign tblval"><code translate="no">0x02</code></td><td class="topAlign">Something else</td></tr> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/whatsnew.html b/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/whatsnew.html index f284b86f6..56e2a9783 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/whatsnew.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/whatsnew.html @@ -3,6 +3,7 @@ <head> <meta charset="utf-8"> <!-- scopedenum.qdoc --> + <meta name="description" content="New classes documentation"> <title>New Classes and Functions | TestCPP</title> </head> <body> diff --git a/tests/auto/qdoc/generatedoutput/testdata/illformatted_documentation/brief_adventures.qdoc b/tests/auto/qdoc/generatedoutput/testdata/illformatted_documentation/brief_adventures.qdoc index b9e621f2b..908271519 100644 --- a/tests/auto/qdoc/generatedoutput/testdata/illformatted_documentation/brief_adventures.qdoc +++ b/tests/auto/qdoc/generatedoutput/testdata/illformatted_documentation/brief_adventures.qdoc @@ -22,3 +22,15 @@ It refers to a change that bypassed the issue by moving the \\keyword command, at \l https://codereview.qt-project.org/c/qt/qtdoc/+/242033/. */ + +/*! + \page page-with-an-image-at-the-top.html + \title This page starts with an image + \brief This page has an image right at the top. + \image leonardo-da-vinci.png This is the alternate text for the image + The image should render as expected, and the alternate text should be + there, too. This text is contained in its own paragraph following the + image. + + This paragraph is a new paragraph, and doesn't contain an image. +*/ diff --git a/tests/auto/qdoc/generatedoutput/testdata/scopedenum/scopedenum.qdoc b/tests/auto/qdoc/generatedoutput/testdata/scopedenum/scopedenum.qdoc index 775e5f81e..22ef9e3f3 100644 --- a/tests/auto/qdoc/generatedoutput/testdata/scopedenum/scopedenum.qdoc +++ b/tests/auto/qdoc/generatedoutput/testdata/scopedenum/scopedenum.qdoc @@ -12,7 +12,8 @@ /*! \enum TestQDoc::Test::ScopedEnum - + \brief This enum has a brief to trigger a bug in CMD_BRIEF. + \omitvalue UselessValue \value This Something \value That Something else \omitvalue OmittedValue \omit Unused - @@ -20,7 +21,6 @@ \value [since 2.0] All Everything \omitvalue VeryLastValue Nothing here - \omitvalue UselessValue A scoped enum. */ @@ -38,6 +38,6 @@ /*! \page whatsnew.html \title New Classes and Functions - + \brief New classes documentation \sincelist 2.0 */ diff --git a/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp b/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp index ea0c47e1a..f110b9e45 100644 --- a/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp +++ b/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp @@ -303,6 +303,7 @@ void tst_generatedOutput::illformated_documentation() "html/illformatted-examples.webxml " "html/illformatteddocumentation-someexample-example.webxml " "html/illformatteddocumentation.index " + "page-with-an-image-at-the-top.html " "brief-adventures.html"); } |