diff options
Diffstat (limited to 'tests')
5 files changed, 2 insertions, 62 deletions
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qmlmodules.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qmlmodules.xml deleted file mode 100644 index 3c99e7916..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qmlmodules.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> -<db:info> -<db:title>QML Modules</db:title> -<db:productname>Test</db:productname> -<db:titleabbrev>A test project for QDoc build artifacts</db:titleabbrev> -<db:abstract> -<db:para>A test project for QDoc build artifacts.</db:para></db:abstract> -</db:info> -<db:variablelist role="qml-modules"> -<db:varlistentry> -<db:term><db:link xlink:href="test-empty-qmlmodule.xml" xlink:role="">No QML Types Here</db:link></db:term> -<db:listitem> -<db:para>A QML module with no member types.</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term><db:link xlink:href="qdoc-test-qmlmodule.xml" xlink:role="">QDoc.Test QML Module</db:link></db:term> -<db:listitem> -<db:para>QML Types for the Test module.</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term><db:link xlink:href="uicomponents-qmlmodule.xml" xlink:role="">UI Components</db:link></db:term> -<db:listitem> -<db:para>Basic set of UI components.</db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> -<db:term><db:link xlink:href="test-nover-qmlmodule.xml" xlink:role="">Versionless QML Module</db:link></db:term> -<db:listitem> -<db:para>QML Types for the Test module without version.</db:para> -</db:listitem> -</db:varlistentry> -</db:variablelist> -<db:section xml:id="examples"> -<db:title>Examples</db:title> -<db:variablelist role="category Application Example"> -<db:listitem> -<db:para><db:link xlink:href="test-componentset-example.xml" xlink:role="page">QML Documentation Example</db:link></db:para> -</db:listitem> -</db:variablelist> -</db:section> -</db:article> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/test-componentset-example.webxml b/tests/auto/qdoc/generatedoutput/expected_output/html/test-componentset-example.webxml index dc77823e2..600f2f3ed 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/html/test-componentset-example.webxml +++ b/tests/auto/qdoc/generatedoutput/expected_output/html/test-componentset-example.webxml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <WebXML> <document> - <page name="componentset" href="test-componentset-example.html" status="active" location="examples.qdoc" documented="true" groups="category Application Example" subtype="example" title="QML Documentation Example" fulltitle="QML Documentation Example" subtitle="" brief="Example for documenting QML types"> + <page name="componentset" href="test-componentset-example.html" status="active" location="examples.qdoc" documented="true" subtype="example" title="QML Documentation Example" fulltitle="QML Documentation Example" subtitle="" brief="Example for documenting QML types"> <contents name="qml-class" title="QML Class" level="1"/> <contents name="properties-signals-handlers-and-methods" title="Properties, Signals, Handlers, and Methods" level="1"/> <contents name="internal-documentation" title="Internal Documentation" level="2"/> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qmlmodules.html b/tests/auto/qdoc/generatedoutput/expected_output/qmlmodules.html index efc9eebcd..3f1a3e78c 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qmlmodules.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qmlmodules.html @@ -6,14 +6,7 @@ <title>QML Modules | Test</title> </head> <body> -<div class="sidebar"> -<div class="toc"> -<h3 id="toc">Contents</h3> -<ul> -<li class="level1"><a href="#examples">Examples</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> +<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> <h1 class="title">QML Modules</h1> <!-- $$$qmlmodules.html-description --> <div class="descr" id="details"> @@ -23,10 +16,6 @@ <tr class="odd topAlign"><td class="tblName" translate="no"><p><a href="uicomponents-qmlmodule.html">UI Components</a></p></td><td class="tblDescr"><p>Basic set of UI components.</p></td></tr> <tr class="even topAlign"><td class="tblName" translate="no"><p><a href="test-nover-qmlmodule.html">Versionless QML Module</a></p></td><td class="tblDescr"><p>QML Types for the Test module without version.</p></td></tr> </table></div> -<h2 id="examples">Examples</h2> -<ul> -<li><a href="test-componentset-example.html">QML Documentation Example</a></li> -</ul> </div> <!-- @@@qmlmodules.html --> </body> diff --git a/tests/auto/qdoc/generatedoutput/testdata/qml/modules.qdoc b/tests/auto/qdoc/generatedoutput/testdata/qml/modules.qdoc index e2177b4f9..f5b7614d9 100644 --- a/tests/auto/qdoc/generatedoutput/testdata/qml/modules.qdoc +++ b/tests/auto/qdoc/generatedoutput/testdata/qml/modules.qdoc @@ -6,8 +6,4 @@ \title QML Modules \generatelist qml-modules - - \section1 Examples - - \generatelist category {Application Example} */ diff --git a/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp b/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp index 6b48d914d..69d930ff4 100644 --- a/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp +++ b/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp @@ -321,7 +321,6 @@ void tst_generatedOutput::docBookFromCpp() void tst_generatedOutput::docBookFromQml() { testAndCompare("testdata/configs/docbook_testqml.qdocconf", - "docbook/qmlmodules.xml " "docbook/test-componentset-example.xml " "docbook/uicomponents-qmlmodule.xml " "docbook/qdoc-test-qmlmodule.xml " |