diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2021-06-11 13:05:54 +0200 |
|---|---|---|
| committer | Topi Reinio <topi.reinio@qt.io> | 2021-06-14 12:25:18 +0200 |
| commit | 99f57491a12c2aa778ab9c8c9d50549d65701694 (patch) | |
| tree | 322ee438a9cd4565cebaa39c055e1821b8c7384b /tests/auto/qdoc/generatedoutput/expected_output/properties/testcpp.index | |
| parent | a13711dfccd32e8387decc921de9126178a32cf3 (diff) | |
qdoc: \generatelist: Ensure we link to the main namespace reference
When there are multiple documentation modules that document items under
the same namespace, we incorrectly linked to the wrong one (a sub-page
generated for a single module). This happened when using
\generatelist namespaces
in a module that was not the one where the namespace is documented
but has a dependency to it; as is the case with the main Qt reference
(qtdoc).
Add documentation comments to make the code slightly more understandable,
and add a test case for both the main reference page and the sub-page
generated for a namespace.
Pick-to: 6.2
Fixes: QTBUG-90540
Change-Id: Ie883ea53896d9d70a17bc01e072648c62a9b8aa3
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'tests/auto/qdoc/generatedoutput/expected_output/properties/testcpp.index')
| -rw-r--r-- | tests/auto/qdoc/generatedoutput/expected_output/properties/testcpp.index | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/properties/testcpp.index b/tests/auto/qdoc/generatedoutput/expected_output/properties/testcpp.index index edc8ecc57..3552694cc 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/properties/testcpp.index +++ b/tests/auto/qdoc/generatedoutput/expected_output/properties/testcpp.index @@ -9,6 +9,9 @@ <page name="autolinking.html" href="autolinking.html" status="active" location="classlists.qdoc" documented="true" subtype="page" title="Autolinking" fulltitle="Autolinking" subtitle="" module="TestCPP"> <contents name="testqdoc" title="TestQDoc" level="1"/> </page> + <namespace name="CrossModuleRef" href="crossmoduleref.html" status="active" access="public" location="testcpp.h" documented="true" module="TestCPP" brief="Namespace that has documented functions in multiple modules"> + <function name="documentMe" fullname="CrossModuleRef::documentMe" href="crossmoduleref.html#documentMe" status="active" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" signature="void documentMe()"/> + </namespace> <page name="obsolete-classes.html" href="obsolete-classes.html" status="active" location="classlists.qdoc" documented="true" subtype="page" title="Obsolete Classes" fulltitle="Obsolete Classes" subtitle="" module="TestCPP"> <contents name="classes-with-obsolete-members" title="Classes with obsolete members" level="1"/> <contents name="testqdoc" title="TestQDoc" level="2"/> @@ -96,6 +99,6 @@ </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" brief="A test module page"/> + <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" brief="A test module page"/> </namespace> </INDEX> |