diff options
Diffstat (limited to 'tests/auto/qdoc/generatedoutput')
13 files changed, 4 insertions, 65 deletions
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-abstractparent.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-abstractparent.xml index 81c6be1b3..9278f7d7e 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-abstractparent.xml +++ b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-abstractparent.xml @@ -38,7 +38,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">Test</db:synopsisinfo> </db:fieldsynopsis> <db:para>Children of the type.</db:para> </db:section> @@ -51,7 +50,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">Test</db:synopsisinfo> </db:fieldsynopsis> <db:para>Name of this parent.</db:para> </db:section> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-child.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-child.xml index f5acb0729..56dea87f8 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-child.xml +++ b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-child.xml @@ -38,7 +38,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">Test</db:synopsisinfo> </db:fieldsynopsis> <db:para>Children of the type.</db:para> </db:section> @@ -51,7 +50,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">Test</db:synopsisinfo> </db:fieldsynopsis> <db:para>Name of this child.</db:para> </db:section> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-type.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-type.xml index 7fa608125..62bdb9e79 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-type.xml +++ b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-type.xml @@ -38,7 +38,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">Test</db:synopsisinfo> </db:fieldsynopsis> <db:bridgehead renderas="sect2" xml:id="group.second-prop">group.second : int</db:bridgehead> <db:fieldsynopsis> @@ -48,7 +47,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">Test</db:synopsisinfo> </db:fieldsynopsis> <db:bridgehead renderas="sect2" xml:id="group.third-prop">group.third : int</db:bridgehead> <db:fieldsynopsis> @@ -58,7 +56,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">Test</db:synopsisinfo> </db:fieldsynopsis> <db:para>A property group.</db:para> </db:section> @@ -72,7 +69,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">Test</db:synopsisinfo> </db:fieldsynopsis> <db:para>A read-only property.</db:para> </db:section> @@ -86,7 +82,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">Test</db:synopsisinfo> </db:fieldsynopsis> <db:para>Name of the Test.</db:para> </db:section> @@ -103,7 +98,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">Test</db:synopsisinfo> </db:fieldsynopsis> <db:informaltable> <db:thead> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-yetanotherchild.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-yetanotherchild.xml index 487043376..46f589605 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-yetanotherchild.xml +++ b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-yetanotherchild.xml @@ -30,7 +30,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">Test</db:synopsisinfo> </db:fieldsynopsis> <db:para>Propagated to inheriting type docs.</db:para> </db:section> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc-test.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc-test.xml index 0e954d1a6..f74a0a992 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc-test.xml +++ b/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc-test.xml @@ -47,7 +47,6 @@ <db:type>SomeType</db:type><db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:typedefsynopsis> <db:para>A typedef.</db:para> </db:section> @@ -71,7 +70,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:constructorsynopsis> <db:para>Default constructor.</db:para> </db:section> @@ -90,7 +88,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:methodsynopsis> <db:para>Move-assigns <db:code role="parameter">other</db:code>.</db:para> </db:section> @@ -112,7 +109,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:methodsynopsis> <db:para>Returns a pointer to a function that takes a boolean. Uses <db:code role="parameter">b</db:code> and <db:code role="parameter">s</db:code>.</db:para> </db:section> @@ -127,7 +123,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:methodsynopsis> <db:para>An inline function, documented using the \fn QDoc command.</db:para> </db:section> @@ -150,7 +145,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:methodsynopsis> <db:para>Function that takes a parameter <db:code role="parameter">v</db:code>. Also returns the value of <db:code role="parameter">v</db:code>.</db:para> </db:section> @@ -173,7 +167,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:methodsynopsis> <db:para>Function that takes a parameter <db:code role="parameter">i</db:code> and <db:code role="parameter">b</db:code>.</db:para> </db:section> @@ -189,7 +182,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:methodsynopsis> <db:para>Function that must be reimplemented.</db:para> </db:section> @@ -214,7 +206,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:methodsynopsis> <db:para>Returns true if <db:code role="parameter">lhs</db:code> and <db:code role="parameter">rhs</db:code> are equal.</db:para> </db:section> @@ -234,7 +225,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:methodsynopsis> <db:para>A macro with argument <db:code role="parameter">x</db:code>.</db:para> <db:para>This function was introduced in Test 1.1.</db:para> @@ -256,7 +246,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">deprecated</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:methodsynopsis> <db:para>This function is deprecated. We strongly advise against using it in new code.</db:para> <db:para>Use <db:link xlink:href="testqdoc-test.xml#obsoleteMember">obsoleteMember</db:link>() instead.</db:para> @@ -272,7 +261,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">deprecated</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:methodsynopsis> <db:para>This function is deprecated since 6.0. We strongly advise against using it in new code.</db:para> <db:para>Use <db:link xlink:href="testqdoc-test.xml#someFunction">someFunction</db:link>() instead.</db:para> @@ -288,7 +276,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">deprecated</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:methodsynopsis> <db:para>This function is deprecated. We strongly advise against using it in new code.</db:para> <db:para>Use <db:link xlink:href="testqdoc-test.xml#someFunction">someFunction</db:link>() instead.</db:para> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc-testderived.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc-testderived.xml index affa01a47..0b1218cd2 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc-testderived.xml +++ b/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc-testderived.xml @@ -47,7 +47,6 @@ <db:type>DerivedType</db:type><db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:typedefsynopsis> <db:para>An aliased typedef.</db:para> </db:section> @@ -57,7 +56,6 @@ <db:type>NotTypedef</db:type><db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:typedefsynopsis> <db:para>I'm an alias, not a typedef.</db:para> </db:section> @@ -77,7 +75,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:methodsynopsis> <db:para>Reimplements: <db:link xlink:href="testqdoc-test.xml#virtualFun" type="function">Test::virtualFun()</db:link>.</db:para> </db:section> @@ -98,7 +95,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">deprecated</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:methodsynopsis> <db:para>This function is deprecated. We strongly advise against using it in new code.</db:para> <db:para>Static obsolete method.</db:para> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc.xml index da531f8cf..2840ef76c 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc.xml +++ b/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc.xml @@ -58,7 +58,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:methodsynopsis> </db:section> </db:section> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/headerfile-docbook/testheader.xml b/tests/auto/qdoc/generatedoutput/expected_output/headerfile-docbook/testheader.xml index afa0b20a3..5c5b9c179 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/headerfile-docbook/testheader.xml +++ b/tests/auto/qdoc/generatedoutput/expected_output/headerfile-docbook/testheader.xml @@ -28,7 +28,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">HeaderFile</db:synopsisinfo> <db:enumitem db:enumidentifier="Glo" db:enumvalue="0"/> <db:enumitem db:enumidentifier="Bal" db:enumvalue="1"/> </db:enumsynopsis> @@ -64,7 +63,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">HeaderFile</db:synopsisinfo> </db:fieldsynopsis> <db:para>Global variable.</db:para> </db:section> @@ -82,7 +80,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">HeaderFile</db:synopsisinfo> </db:methodsynopsis> <db:para>Global function.</db:para> </db:section> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/properties-docbook/testqdoc-testderived.xml b/tests/auto/qdoc/generatedoutput/expected_output/properties-docbook/testqdoc-testderived.xml index 184d6f86e..5dd6c8886 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/properties-docbook/testqdoc-testderived.xml +++ b/tests/auto/qdoc/generatedoutput/expected_output/properties-docbook/testqdoc-testderived.xml @@ -47,7 +47,6 @@ <db:type>DerivedType</db:type><db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:typedefsynopsis> <db:para>An aliased typedef.</db:para> </db:section> @@ -57,7 +56,6 @@ <db:type>NotTypedef</db:type><db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:typedefsynopsis> <db:para>I'm an alias, not a typedef.</db:para> </db:section> @@ -73,7 +71,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> <db:synopsisinfo db:role="getter">bindableProp</db:synopsisinfo> <db:synopsisinfo db:role="setter">setBindableProp</db:synopsisinfo> <db:synopsisinfo db:role="notifier">bindablePropChanged</db:synopsisinfo> @@ -90,7 +87,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> <db:synopsisinfo db:role="getter">boolProp</db:synopsisinfo> <db:synopsisinfo db:role="setter">setBoolProp</db:synopsisinfo> <db:synopsisinfo db:role="resetter">resetBoolProp</db:synopsisinfo> @@ -131,7 +127,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> <db:synopsisinfo db:role="getter">getInt</db:synopsisinfo> </db:fieldsynopsis> <db:para>An integer property.</db:para> @@ -154,7 +149,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> <db:synopsisinfo db:role="getter">name</db:synopsisinfo> </db:fieldsynopsis> <db:para>This property holds a name.</db:para> @@ -177,7 +171,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> <db:synopsisinfo db:role="getter">someProp</db:synopsisinfo> </db:fieldsynopsis> <db:para>This property supports <db:link xlink:href="https://wiki.qt.io/QProperty">QProperty</db:link> bindings.</db:para> @@ -197,7 +190,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:methodsynopsis> <db:para>Emitted when things happen.</db:para> <db:note> @@ -215,7 +207,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:methodsynopsis> <db:para>Something invokable.</db:para> <db:note> @@ -235,7 +226,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:methodsynopsis> <db:para>Reimplements: <db:link xlink:href="testqdoc-test.xml#virtualFun" type="function">Test::virtualFun()</db:link>.</db:para> </db:section> @@ -256,7 +246,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">deprecated</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:methodsynopsis> <db:para>This function is deprecated. We strongly advise against using it in new code.</db:para> <db:para>Static obsolete method.</db:para> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/properties/testcpp.index b/tests/auto/qdoc/generatedoutput/expected_output/properties/testcpp.index index fd21f16ec..141351e4d 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/properties/testcpp.index +++ b/tests/auto/qdoc/generatedoutput/expected_output/properties/testcpp.index @@ -99,7 +99,7 @@ </property> </class> </namespace> - <group name="testgroup" href="testgroup.html" status="internal" seen="false" title="" members="Test,QDOCTEST_MACRO2,someFunctionDefaultArg"/> - <module name="TestCPP" href="testcpp-module.html" status="active" documented="true" seen="true" title="QDoc Test C++ Classes" module="TestCPP" members="TestQDoc,Test,TestDerived,CrossModuleRef,DontLinkToMe" brief="A test module page"/> + <group name="testgroup" href="testgroup.html" status="internal" seen="false" title=""/> + <module name="TestCPP" href="testcpp-module.html" status="active" documented="true" seen="true" title="QDoc Test C++ Classes" brief="A test module page"/> </namespace> </INDEX> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups-docbook/qml-qdoc-test-parent.xml b/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups-docbook/qml-qdoc-test-parent.xml index fd07da33a..de88d4e07 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups-docbook/qml-qdoc-test-parent.xml +++ b/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups-docbook/qml-qdoc-test-parent.xml @@ -37,7 +37,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">QmlPropertyGroups</db:synopsisinfo> </db:fieldsynopsis> <db:bridgehead renderas="sect2" xml:id="group.b-prop">[read-only] group.b : int</db:bridgehead> <db:fieldsynopsis> @@ -48,7 +47,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">QmlPropertyGroups</db:synopsisinfo> </db:fieldsynopsis> <db:bridgehead renderas="sect2" xml:id="group.c-prop">[since 2.0] group.c : int</db:bridgehead> <db:fieldsynopsis> @@ -58,7 +56,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">QmlPropertyGroups</db:synopsisinfo> </db:fieldsynopsis> <db:para>Property group.</db:para> </db:section> 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 7105cc7da..35bbebcae 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 @@ -48,7 +48,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> <db:enumitem db:enumidentifier="Yee" db:enumvalue="0"/> <db:enumitem db:enumidentifier="Haw" db:enumvalue="1"/> <db:enumitem db:enumidentifier="Howdy" db:enumvalue="2"/> @@ -94,7 +93,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> <db:enumitem db:enumidentifier="This" db:enumvalue="0x01"/> <db:enumitem db:enumidentifier="That" db:enumvalue="0x02"/> <db:enumitem db:enumidentifier="All" db:enumvalue="This | That"/> @@ -146,7 +144,6 @@ <db:type>SomeType</db:type><db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:typedefsynopsis> <db:para>A typedef.</db:para> </db:section> @@ -170,7 +167,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:constructorsynopsis> <db:para>Default constructor.</db:para> </db:section> @@ -189,7 +185,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:methodsynopsis> <db:para>Move-assigns <db:code role="parameter">other</db:code>.</db:para> </db:section> @@ -211,7 +206,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:methodsynopsis> <db:para>Returns a pointer to a function that takes a boolean. Uses <db:code role="parameter">b</db:code> and <db:code role="parameter">s</db:code>.</db:para> </db:section> @@ -226,7 +220,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:methodsynopsis> <db:para>An inline function, documented using the \fn QDoc command.</db:para> </db:section> @@ -249,7 +242,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:methodsynopsis> <db:para>Function that takes a parameter <db:code role="parameter">v</db:code>. Also returns the value of <db:code role="parameter">v</db:code>.</db:para> </db:section> @@ -272,7 +264,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:methodsynopsis> <db:para>Function that takes a parameter <db:code role="parameter">i</db:code> and <db:code role="parameter">b</db:code>.</db:para> </db:section> @@ -288,7 +279,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:methodsynopsis> <db:para>Function that must be reimplemented.</db:para> </db:section> @@ -313,7 +303,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:methodsynopsis> <db:para>Returns true if <db:code role="parameter">lhs</db:code> and <db:code role="parameter">rhs</db:code> are equal.</db:para> </db:section> @@ -333,7 +322,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">active</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:methodsynopsis> <db:para>A macro with argument <db:code role="parameter">x</db:code>.</db:para> <db:para>This function was introduced in Test 1.1.</db:para> @@ -355,7 +343,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">deprecated</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:methodsynopsis> <db:para>This function is deprecated. We strongly advise against using it in new code.</db:para> <db:para>Use <db:link xlink:href="testqdoc-test.xml#obsoleteMember">obsoleteMember</db:link>() instead.</db:para> @@ -371,7 +358,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">deprecated</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:methodsynopsis> <db:para>This function is deprecated since 6.0. We strongly advise against using it in new code.</db:para> <db:para>Use <db:link xlink:href="testqdoc-test.xml#someFunction">someFunction</db:link>() instead.</db:para> @@ -387,7 +373,6 @@ <db:synopsisinfo db:role="access">public</db:synopsisinfo> <db:synopsisinfo db:role="status">deprecated</db:synopsisinfo> <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo> -<db:synopsisinfo db:role="module">TestCPP</db:synopsisinfo> </db:methodsynopsis> <db:para>This function is deprecated. We strongly advise against using it in new code.</db:para> <db:para>Use <db:link xlink:href="testqdoc-test.xml#someFunction">someFunction</db:link>() instead.</db:para> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testcpp.index b/tests/auto/qdoc/generatedoutput/expected_output/testcpp.index index 6b3a1b66e..b325bea6c 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testcpp.index +++ b/tests/auto/qdoc/generatedoutput/expected_output/testcpp.index @@ -62,7 +62,7 @@ <typedef name="NotTypedef" fullname="TestQDoc::TestDerived::NotTypedef" href="testqdoc-testderived.html#NotTypedef-typedef" status="active" access="public" location="testcpp.h" documented="true" aliasedtype="int"/> </class> </namespace> - <group name="testgroup" href="testgroup.html" status="internal" seen="false" title="" members="Test,QDOCTEST_MACRO2,someFunctionDefaultArg"/> - <module name="TestCPP" href="testcpp-module.html" status="active" documented="true" seen="true" title="QDoc Test C++ Classes" module="TestCPP" members="TestQDoc,Test,TestDerived,CrossModuleRef,DontLinkToMe" brief="A test module page"/> + <group name="testgroup" href="testgroup.html" status="internal" seen="false" title=""/> + <module name="TestCPP" href="testcpp-module.html" status="active" documented="true" seen="true" title="QDoc Test C++ Classes" brief="A test module page"/> </namespace> </INDEX> |