QDoc: Move tst_generatedoutput under src

QDoc is currently restructuring its source code to simplify certain
expected future developments.

As part of this restructuring, all tests have been moving from the
"tests" directory to an appropriate place under the "src" directory.

`tst_generatedoutput` performs end-to-end regression testing for the
"qdoc" binary.

It was previously positioned under the "test" directory and is now moved
under the "src/qdoc/test" directory, as part of the restructuring.

The "CMakeLists.txt" file under "src/qdoc/qdoc/test" was modified to
dispatch to the moved "generatedoutput" test directory.

The "CMakeLists.txt" file in "tests/auto/qdoc" was modified to include
"src/qdoc/qdoc/tests/generatedoutput/CMakeLists.txt", to ensure that
`tst_generatedoutput` is able to run in CI.

Adds SPDX license headers to files that were missing it in "generatedoutput/testdata"

Change-Id: I412496ef0bf8ea9c07deda63960c11f0a5a06cc4
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>

327 files changed, 71 insertions, 44 deletions

diff --git a/src/qdoc/qdoc/tests/CMakeLists.txt b/src/qdoc/qdoc/tests/CMakeLists.txt
index 47c684325..60ed86d68 100644
--- a/src/qdoc/qdoc/tests/CMakeLists.txt
+++ b/src/qdoc/qdoc/tests/CMakeLists.txt
@@ -2,3 +2,4 @@ add_subdirectory(qdoc)
 add_subdirectory(config)
 add_subdirectory(qdoccommandlineparser)
 add_subdirectory(utilities)
+add_subdirectory(generatedoutput)
diff --git a/tests/auto/qdoc/generatedoutput/CMakeLists.txt b/src/qdoc/qdoc/tests/generatedoutput/CMakeLists.txt
index 8a3949e53..1dea3ae59 100644
--- a/tests/auto/qdoc/generatedoutput/CMakeLists.txt
+++ b/src/qdoc/qdoc/tests/generatedoutput/CMakeLists.txt
@@ -15,7 +15,7 @@ endif()
 
 qt_internal_add_test(tst_generatedOutput
     SOURCES
-        tst_generatedoutput.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/tst_generatedoutput.cpp
 )
 
 # Write relevant Qt include path to a file, to be read in by QDoc
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/8b5c72eb.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/8b5c72eb.html
index f52b65618..f52b65618 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/8b5c72eb.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/8b5c72eb.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/adventures-with-non-ascii-characters.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/adventures-with-non-ascii-characters.html
index 5d7532e88..5d7532e88 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/adventures-with-non-ascii-characters.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/adventures-with-non-ascii-characters.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/another-page-with-comments-in-the-brief.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/another-page-with-comments-in-the-brief.html
index 71ef2af25..71ef2af25 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/another-page-with-comments-in-the-brief.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/another-page-with-comments-in-the-brief.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/autolinking.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/autolinking.html
index 0b68b1de8..0b68b1de8 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/autolinking.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/autolinking.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/brief-adventures.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/brief-adventures.html
index 009104a6f..009104a6f 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/brief-adventures.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/brief-adventures.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/cpptypes.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/cpptypes.html
index 8d91afd76..8d91afd76 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/cpptypes.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/cpptypes.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/all-namespaces.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/crossmodule/all-namespaces.html
index 8d23c2aef..8d23c2aef 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/all-namespaces.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/crossmodule/all-namespaces.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/crossmoduleref-sub-crossmodule.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/crossmodule/crossmoduleref-sub-crossmodule.html
index 7d40a92d6..7d40a92d6 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/crossmoduleref-sub-crossmodule.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/crossmodule/crossmoduleref-sub-crossmodule.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype-members.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/crossmodule/testtype-members.html
index a79b011c8..a79b011c8 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype-members.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/crossmodule/testtype-members.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/crossmodule/testtype.html
index ed8bfc96c..ed8bfc96c 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/crossmodule/testtype.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/crossmoduleref.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/crossmoduleref.html
index 2d073e237..2d073e237 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/crossmoduleref.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/crossmoduleref.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook-nestedmacro/testcpp-module.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook-nestedmacro/testcpp-module.xml
index 08e674292..08e674292 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook-nestedmacro/testcpp-module.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook-nestedmacro/testcpp-module.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/cpptypes.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/cpptypes.xml
index d8a4528b8..d8a4528b8 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/cpptypes.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/cpptypes.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoc-test-qmlmodule.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qdoc-test-qmlmodule.xml
index 793dc3ea1..793dc3ea1 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoc-test-qmlmodule.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qdoc-test-qmlmodule.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput-exhaustive.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput-exhaustive.xml
index 59b06321d..59b06321d 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput-exhaustive.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput-exhaustive.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput-linking.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput-linking.xml
index 526279c9a..526279c9a 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput-linking.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput-linking.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput.xml
index a4a1d7c48..a4a1d7c48 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocmanuallikefileoutput.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qdoctests-qdocmanuallikefileoutput.xml
index c9e3ec024..c9e3ec024 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocmanuallikefileoutput.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qdoctests-qdocmanuallikefileoutput.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-int.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qml-int.xml
index f5e99f6ab..f5e99f6ab 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-int.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qml-int.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-abstractparent.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qml-qdoc-test-abstractparent.xml
index b1f0eb9c7..b1f0eb9c7 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-abstractparent.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qml-qdoc-test-abstractparent.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-child.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qml-qdoc-test-child.xml
index 82b98d215..82b98d215 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-child.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qml-qdoc-test-child.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-doctest.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qml-qdoc-test-doctest.xml
index 333ec52be..333ec52be 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-doctest.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qml-qdoc-test-doctest.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-oldtype.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qml-qdoc-test-oldtype.xml
index e2d1059b4..e2d1059b4 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-oldtype.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qml-qdoc-test-oldtype.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-type.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qml-qdoc-test-type.xml
index 1e082bc5c..1e082bc5c 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-type.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qml-qdoc-test-type.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-yetanotherchild.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qml-qdoc-test-yetanotherchild.xml
index 92a9b6d6f..92a9b6d6f 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-yetanotherchild.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qml-qdoc-test-yetanotherchild.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-test-nover-typenoversion.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qml-test-nover-typenoversion.xml
index 4e96ad30d..4e96ad30d 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-test-nover-typenoversion.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qml-test-nover-typenoversion.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-uicomponents-progressbar.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qml-uicomponents-progressbar.xml
index 67ef7eeb4..67ef7eeb4 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-uicomponents-progressbar.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qml-uicomponents-progressbar.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-uicomponents-switch.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qml-uicomponents-switch.xml
index 9eea38071..9eea38071 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-uicomponents-switch.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qml-uicomponents-switch.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-uicomponents-tabwidget.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qml-uicomponents-tabwidget.xml
index 5d81ac092..5d81ac092 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-uicomponents-tabwidget.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/qml-uicomponents-tabwidget.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/test-componentset-example.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/test-componentset-example.xml
index a5ffd1cd0..a5ffd1cd0 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/test-componentset-example.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/test-componentset-example.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/test-nover-qmlmodule.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/test-nover-qmlmodule.xml
index 091fe4358..091fe4358 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/test-nover-qmlmodule.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/test-nover-qmlmodule.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/testcpp-module.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/testcpp-module.xml
index 00c945eec..00c945eec 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/testcpp-module.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/testcpp-module.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc-test.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/testqdoc-test.xml
index 61657e1bd..61657e1bd 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc-test.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/testqdoc-test.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc-testderived.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/testqdoc-testderived.xml
index 1f622aad4..1f622aad4 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc-testderived.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/testqdoc-testderived.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/testqdoc.xml
index a621a5b4c..a621a5b4c 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/testqdoc.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/uicomponents-qmlmodule.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/uicomponents-qmlmodule.xml
index 80e5b0cdc..80e5b0cdc 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/uicomponents-qmlmodule.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbook/uicomponents-qmlmodule.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qdoc-test-qmlmodule.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qdoc-test-qmlmodule.xml
index 20564e8c1..20564e8c1 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qdoc-test-qmlmodule.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qdoc-test-qmlmodule.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qdoctests-qdocfileoutput-exhaustive.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qdoctests-qdocfileoutput-exhaustive.xml
index cbd5d0852..cbd5d0852 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qdoctests-qdocfileoutput-exhaustive.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qdoctests-qdocfileoutput-exhaustive.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qdoctests-qdocfileoutput-linking.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qdoctests-qdocfileoutput-linking.xml
index 51b7e62b3..51b7e62b3 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qdoctests-qdocfileoutput-linking.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qdoctests-qdocfileoutput-linking.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qdoctests-qdocfileoutput.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qdoctests-qdocfileoutput.xml
index 72905681d..72905681d 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qdoctests-qdocfileoutput.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qdoctests-qdocfileoutput.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qdoctests-qdocmanuallikefileoutput.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qdoctests-qdocmanuallikefileoutput.xml
index 38e3887ef..38e3887ef 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qdoctests-qdocmanuallikefileoutput.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qdoctests-qdocmanuallikefileoutput.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qml-int.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qml-int.xml
index c7ce09e55..c7ce09e55 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qml-int.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qml-int.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qml-qdoc-test-abstractparent.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qml-qdoc-test-abstractparent.xml
index 154b70b0f..154b70b0f 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qml-qdoc-test-abstractparent.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qml-qdoc-test-abstractparent.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qml-qdoc-test-child.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qml-qdoc-test-child.xml
index 76df460b7..76df460b7 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qml-qdoc-test-child.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qml-qdoc-test-child.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qml-qdoc-test-doctest.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qml-qdoc-test-doctest.xml
index c698a1260..c698a1260 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qml-qdoc-test-doctest.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qml-qdoc-test-doctest.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qml-qdoc-test-type.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qml-qdoc-test-type.xml
index 1aadde7c1..1aadde7c1 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qml-qdoc-test-type.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qml-qdoc-test-type.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qml-qdoc-test-yetanotherchild.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qml-qdoc-test-yetanotherchild.xml
index 34264b735..34264b735 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qml-qdoc-test-yetanotherchild.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qml-qdoc-test-yetanotherchild.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qml-test-nover-typenoversion.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qml-test-nover-typenoversion.xml
index 87576add4..87576add4 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qml-test-nover-typenoversion.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qml-test-nover-typenoversion.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qml-uicomponents-progressbar.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qml-uicomponents-progressbar.xml
index cd0945ec1..cd0945ec1 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qml-uicomponents-progressbar.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qml-uicomponents-progressbar.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qml-uicomponents-switch.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qml-uicomponents-switch.xml
index 65992be73..65992be73 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qml-uicomponents-switch.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qml-uicomponents-switch.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qml-uicomponents-tabwidget.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qml-uicomponents-tabwidget.xml
index 61644e64d..61644e64d 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/qml-uicomponents-tabwidget.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/qml-uicomponents-tabwidget.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/test-componentset-example.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/test-componentset-example.xml
index add2bcae1..add2bcae1 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/test-componentset-example.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/test-componentset-example.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/test-nover-qmlmodule.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/test-nover-qmlmodule.xml
index e4aec6d09..e4aec6d09 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/test-nover-qmlmodule.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/test-nover-qmlmodule.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/testcpp-module.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/testcpp-module.xml
index 277a28f1d..277a28f1d 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/testcpp-module.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/testcpp-module.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/testqdoc-test.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/testqdoc-test.xml
index 06b8f5816..06b8f5816 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/testqdoc-test.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/testqdoc-test.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/testqdoc-testderived.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/testqdoc-testderived.xml
index bc2e540f4..bc2e540f4 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/testqdoc-testderived.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/testqdoc-testderived.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/testqdoc.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/testqdoc.xml
index a2fec4b0c..a2fec4b0c 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/testqdoc.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/testqdoc.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/uicomponents-qmlmodule.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/uicomponents-qmlmodule.xml
index f00b3d3f7..f00b3d3f7 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbookext/uicomponents-qmlmodule.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/docbookext/uicomponents-qmlmodule.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/classes.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/dontdocument/classes.html
index e01914d6b..e01914d6b 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/classes.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/dontdocument/classes.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/dontdocument.qhp b/src/qdoc/qdoc/tests/generatedoutput/expected_output/dontdocument/dontdocument.qhp
index 7d789e193..7d789e193 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/dontdocument.qhp
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/dontdocument/dontdocument.qhp
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/seenclass.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/dontdocument/seenclass.html
index a4f91eda8..a4f91eda8 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/seenclass.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/dontdocument/seenclass.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/e85685de.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/e85685de.html
index ea52873e7..ea52873e7 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/e85685de.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/e85685de.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/examples-manifest.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/examples-manifest.xml
index b33aa00b9..b33aa00b9 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/examples-manifest.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/examples-manifest.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/first.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/first.html
index 74033f353..74033f353 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/first.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/first.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/globals.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/globals.html
index 92f6883ee..92f6883ee 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/globals.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/globals.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/headerfile-docbook/headers.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/headerfile-docbook/headers.xml
index 052108b2a..052108b2a 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/headerfile-docbook/headers.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/headerfile-docbook/headers.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/headerfile-docbook/testheader.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/headerfile-docbook/testheader.xml
index e4edd0fc0..e4edd0fc0 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/headerfile-docbook/testheader.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/headerfile-docbook/testheader.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/headerfile/headers.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/headerfile/headers.html
index 1a60ec30b..1a60ec30b 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/headerfile/headers.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/headerfile/headers.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/headerfile/testheader.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/headerfile/testheader.html
index ebc565d99..ebc565d99 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/headerfile/testheader.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/headerfile/testheader.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/8b5c72eb.webxml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/8b5c72eb.webxml
index 375c43732..375c43732 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/html/8b5c72eb.webxml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/8b5c72eb.webxml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/e85685de.webxml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/e85685de.webxml
index beb4df518..beb4df518 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/html/e85685de.webxml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/e85685de.webxml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/first.webxml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/first.webxml
index 526bbbe73..526bbbe73 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/html/first.webxml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/first.webxml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/illformatted-examples.webxml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/illformatted-examples.webxml
index b49d1b297..b49d1b297 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/html/illformatted-examples.webxml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/illformatted-examples.webxml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/illformatteddocumentation-someexample-example.webxml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/illformatteddocumentation-someexample-example.webxml
index 675e3d74f..675e3d74f 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/html/illformatteddocumentation-someexample-example.webxml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/illformatteddocumentation-someexample-example.webxml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/illformatteddocumentation.index b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/illformatteddocumentation.index
index e9898cd2e..e9898cd2e 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/html/illformatteddocumentation.index
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/illformatteddocumentation.index
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/index.webxml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/index.webxml
index 659d98f22..659d98f22 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/html/index.webxml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/index.webxml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/mozzarella-7c883eff.webxml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/mozzarella-7c883eff.webxml
index 13ce91b72..13ce91b72 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/html/mozzarella-7c883eff.webxml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/mozzarella-7c883eff.webxml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/nonasciicharacterinput.index b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/nonasciicharacterinput.index
index aa306d7eb..aa306d7eb 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/html/nonasciicharacterinput.index
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/nonasciicharacterinput.index
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput-exhaustive.webxml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/qdoctests-qdocfileoutput-exhaustive.webxml
index a02025ddd..a02025ddd 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput-exhaustive.webxml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/qdoctests-qdocfileoutput-exhaustive.webxml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput-linking.webxml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/qdoctests-qdocfileoutput-linking.webxml
index 1bb19e10e..1bb19e10e 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput-linking.webxml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/qdoctests-qdocfileoutput-linking.webxml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput.webxml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/qdoctests-qdocfileoutput.webxml
index 13b3e5c51..13b3e5c51 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput.webxml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/qdoctests-qdocfileoutput.webxml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocmanuallikefileoutput.webxml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/qdoctests-qdocmanuallikefileoutput.webxml
index 4502dcf7f..4502dcf7f 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocmanuallikefileoutput.webxml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/qdoctests-qdocmanuallikefileoutput.webxml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/santa-14209312.webxml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/santa-14209312.webxml
index 9d07c9da8..9d07c9da8 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/html/santa-14209312.webxml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/santa-14209312.webxml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/second.webxml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/second.webxml
index 9ecd3c2fe..9ecd3c2fe 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/html/second.webxml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/second.webxml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/seite-mit-ausschlie-lich-gro-buchstaben-im-titel-berschrift-htm-bfa91582.webxml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/seite-mit-ausschlie-lich-gro-buchstaben-im-titel-berschrift-htm-bfa91582.webxml
index 8fe3c93ee..8fe3c93ee 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/html/seite-mit-ausschlie-lich-gro-buchstaben-im-titel-berschrift-htm-bfa91582.webxml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/seite-mit-ausschlie-lich-gro-buchstaben-im-titel-berschrift-htm-bfa91582.webxml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/test-componentset-example.webxml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/test-componentset-example.webxml
index 600f2f3ed..600f2f3ed 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/html/test-componentset-example.webxml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/test-componentset-example.webxml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/test-nover-qmlmodule.webxml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/test-nover-qmlmodule.webxml
index 5d24b3077..5d24b3077 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/html/test-nover-qmlmodule.webxml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/test-nover-qmlmodule.webxml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/testcpp-module.webxml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/testcpp-module.webxml
index 5d24b3077..5d24b3077 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/html/testcpp-module.webxml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/testcpp-module.webxml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/testqdoc-test.webxml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/testqdoc-test.webxml
index 849b62507..849b62507 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/html/testqdoc-test.webxml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/testqdoc-test.webxml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/testqdoc-testderived.webxml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/testqdoc-testderived.webxml
index 3752e9950..3752e9950 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/html/testqdoc-testderived.webxml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/testqdoc-testderived.webxml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/third.webxml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/third.webxml
index 529ffd896..529ffd896 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/html/third.webxml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/third.webxml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/uicomponents-qmlmodule.webxml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/uicomponents-qmlmodule.webxml
index 5d24b3077..5d24b3077 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/html/uicomponents-qmlmodule.webxml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/html/uicomponents-qmlmodule.webxml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc-test.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/ignoresince/testqdoc-test.html
index 0b33938bc..0b33938bc 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc-test.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/ignoresince/testqdoc-test.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/ignoresince/testqdoc.html
index 7288e8d98..7288e8d98 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/ignoresince/testqdoc.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/index.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/includefromexampledirs/index.html
index 0d984f60d..0d984f60d 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/index.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/includefromexampledirs/index.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent-members.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent-members.html
index beb7792f7..beb7792f7 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent-members.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent-members.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent.html
index 727dcbe73..727dcbe73 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/index-linking.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/index-linking.html
index 694a3f061..694a3f061 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/index-linking.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/index-linking.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/index.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/index.html
index f934cfdca..f934cfdca 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/index.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/index.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/linecomments/a-page-with-a-line-comment-in-the-see-also-command.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/linecomments/a-page-with-a-line-comment-in-the-see-also-command.html
index 27ba4c2a3..27ba4c2a3 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/linecomments/a-page-with-a-line-comment-in-the-see-also-command.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/linecomments/a-page-with-a-line-comment-in-the-see-also-command.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/linecomments/a-page-with-a-line-comment-in-the-see-also-command.webxml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/linecomments/a-page-with-a-line-comment-in-the-see-also-command.webxml
index cb0caedf9..cb0caedf9 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/linecomments/a-page-with-a-line-comment-in-the-see-also-command.webxml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/linecomments/a-page-with-a-line-comment-in-the-see-also-command.webxml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/linecomments/a-page-with-a-line-comment-in-the-see-also-command.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/linecomments/a-page-with-a-line-comment-in-the-see-also-command.xml
index 45be05ac6..45be05ac6 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/linecomments/a-page-with-a-line-comment-in-the-see-also-command.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/linecomments/a-page-with-a-line-comment-in-the-see-also-command.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/linecomments/another-page-with-an-image-at-the-top.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/linecomments/another-page-with-an-image-at-the-top.html
index 27c53b8ac..27c53b8ac 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/linecomments/another-page-with-an-image-at-the-top.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/linecomments/another-page-with-an-image-at-the-top.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/linecomments/another-page-with-an-image-at-the-top.webxml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/linecomments/another-page-with-an-image-at-the-top.webxml
index b2551df18..b2551df18 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/linecomments/another-page-with-an-image-at-the-top.webxml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/linecomments/another-page-with-an-image-at-the-top.webxml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/linecomments/another-page-with-an-image-at-the-top.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/linecomments/another-page-with-an-image-at-the-top.xml
index c905f9c45..c905f9c45 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/linecomments/another-page-with-an-image-at-the-top.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/linecomments/another-page-with-an-image-at-the-top.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/linecomments/line-comment-adventures.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/linecomments/line-comment-adventures.html
index 1b1ab281c..1b1ab281c 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/linecomments/line-comment-adventures.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/linecomments/line-comment-adventures.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/linecomments/line-comment-adventures.webxml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/linecomments/line-comment-adventures.webxml
index b84706e96..b84706e96 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/linecomments/line-comment-adventures.webxml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/linecomments/line-comment-adventures.webxml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/linecomments/line-comment-adventures.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/linecomments/line-comment-adventures.xml
index e78104e3d..e78104e3d 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/linecomments/line-comment-adventures.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/linecomments/line-comment-adventures.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/mozzarella-7c883eff.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/mozzarella-7c883eff.html
index bb4b3651d..bb4b3651d 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/mozzarella-7c883eff.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/mozzarella-7c883eff.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/mozzarella.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/mozzarella.html
index bb4b3651d..bb4b3651d 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/mozzarella.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/mozzarella.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/nestedmacro/testcpp-module.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/nestedmacro/testcpp-module.html
index e2fb2598e..e2fb2598e 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/nestedmacro/testcpp-module.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/nestedmacro/testcpp-module.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/noautolist-docbook/qdoc-test-qmlmodule.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/noautolist-docbook/qdoc-test-qmlmodule.xml
index 1ac355ab3..1ac355ab3 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/noautolist-docbook/qdoc-test-qmlmodule.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/noautolist-docbook/qdoc-test-qmlmodule.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/noautolist-docbook/test-componentset-example.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/noautolist-docbook/test-componentset-example.xml
index 609b7cec9..609b7cec9 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/noautolist-docbook/test-componentset-example.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/noautolist-docbook/test-componentset-example.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/noautolist-docbook/testcpp-module.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/noautolist-docbook/testcpp-module.xml
index 3217c0d94..3217c0d94 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/noautolist-docbook/testcpp-module.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/noautolist-docbook/testcpp-module.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/qdoc-test-qmlmodule.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/noautolist/qdoc-test-qmlmodule.html
index 23c56acef..23c56acef 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/qdoc-test-qmlmodule.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/noautolist/qdoc-test-qmlmodule.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/test-componentset-example.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/noautolist/test-componentset-example.html
index a6d63699b..a6d63699b 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/test-componentset-example.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/noautolist/test-componentset-example.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/testcpp-module.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/noautolist/testcpp-module.html
index f413175b0..f413175b0 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/testcpp-module.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/noautolist/testcpp-module.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/obsolete-classes.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/obsolete-classes.html
index 495d2340a..495d2340a 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/obsolete-classes.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/obsolete-classes.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/page-with-an-image-at-the-top.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/page-with-an-image-at-the-top.html
index 5675558f4..5675558f4 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/page-with-an-image-at-the-top.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/page-with-an-image-at-the-top.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/page-with-comment-after-brief.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/page-with-comment-after-brief.html
index fc6fa1b92..fc6fa1b92 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/page-with-comment-after-brief.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/page-with-comment-after-brief.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/page-with-comment-in-brief.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/page-with-comment-in-brief.html
index 4283ae544..4283ae544 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/page-with-comment-in-brief.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/page-with-comment-in-brief.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/properties-docbook/testqdoc-testderived.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/properties-docbook/testqdoc-testderived.xml
index 08e44daf9..08e44daf9 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/properties-docbook/testqdoc-testderived.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/properties-docbook/testqdoc-testderived.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/properties/qml-themodule-thetype.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/properties/qml-themodule-thetype.html
index 0f2614481..0f2614481 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/properties/qml-themodule-thetype.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/properties/qml-themodule-thetype.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/properties/testcpp.index b/src/qdoc/qdoc/tests/generatedoutput/expected_output/properties/testcpp.index
index 2bdb475c6..2bdb475c6 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/properties/testcpp.index
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/properties/testcpp.index
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived-members.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/properties/testqdoc-testderived-members.html
index 4cc19057f..4cc19057f 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived-members.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/properties/testqdoc-testderived-members.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/properties/testqdoc-testderived.html
index d5e784adb..d5e784adb 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/properties/testqdoc-testderived.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/proxypage-docbook/stdpair-proxy.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/proxypage-docbook/stdpair-proxy.xml
index 7dbbc54c1..7dbbc54c1 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/proxypage-docbook/stdpair-proxy.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/proxypage-docbook/stdpair-proxy.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/proxypage/stdpair-proxy.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/proxypage/stdpair-proxy.html
index 5b542adb4..5b542adb4 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/proxypage/stdpair-proxy.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/proxypage/stdpair-proxy.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qdoc-test-qmlmodule.html
index ea8197a32..ea8197a32 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qdoc-test-qmlmodule.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-exhaustive.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qdoctests-qdocfileoutput-exhaustive.html
index f62cbba6c..f62cbba6c 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-exhaustive.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qdoctests-qdocfileoutput-exhaustive.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html
index b4d63e76e..b4d63e76e 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qdoctests-qdocfileoutput.html
index 74570305c..74570305c 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qdoctests-qdocfileoutput.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocmanuallikefileoutput.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qdoctests-qdocmanuallikefileoutput.html
index 80ed5a0f7..80ed5a0f7 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocmanuallikefileoutput.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qdoctests-qdocmanuallikefileoutput.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-int.html
index bd6e61efd..bd6e61efd 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-int.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-linkmodule-grandchild-members.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-linkmodule-grandchild-members.html
index 79f54c827..79f54c827 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-linkmodule-grandchild-members.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-linkmodule-grandchild-members.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-abstractparent.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-qdoc-test-abstractparent.html
index cc590a470..cc590a470 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-abstractparent.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-qdoc-test-abstractparent.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-child.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-qdoc-test-child.html
index 323c7b91b..323c7b91b 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-child.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-qdoc-test-child.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-doctest.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-qdoc-test-doctest.html
index bf1a70765..bf1a70765 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-doctest.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-qdoc-test-doctest.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-oldtype.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-qdoc-test-oldtype.html
index 7256fa12c..7256fa12c 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-oldtype.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-qdoc-test-oldtype.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-members.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-qdoc-test-type-members.html
index 78b4afecf..78b4afecf 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-members.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-qdoc-test-type-members.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-obsolete.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-qdoc-test-type-obsolete.html
index 028977ffb..028977ffb 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-obsolete.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-qdoc-test-type-obsolete.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-qdoc-test-type.html
index 364d3505d..364d3505d 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-qdoc-test-type.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-yetanotherchild.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-qdoc-test-yetanotherchild.html
index 85c478746..85c478746 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-yetanotherchild.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-qdoc-test-yetanotherchild.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-test-nover-doctest.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-test-nover-doctest.html
index 9d13af43d..9d13af43d 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-test-nover-doctest.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-test-nover-doctest.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-test-nover-typenoversion-members.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-test-nover-typenoversion-members.html
index d58b80f59..d58b80f59 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-test-nover-typenoversion-members.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-test-nover-typenoversion-members.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-test-nover-typenoversion.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-test-nover-typenoversion.html
index b426c95a9..b426c95a9 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-test-nover-typenoversion.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-test-nover-typenoversion.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-uicomponents-progressbar.html
index 3ab477cb2..3ab477cb2 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-uicomponents-progressbar.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-uicomponents-switch.html
index 31149d12f..31149d12f 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-uicomponents-switch.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-uicomponents-tabwidget.html
index 97275b63a..97275b63a 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qml-uicomponents-tabwidget.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qmlmodules.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qmlmodules.html
index 3f1a3e78c..3f1a3e78c 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qmlmodules.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qmlmodules.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups-docbook/qml-qdoc-test-parent.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qmlpropertygroups-docbook/qml-qdoc-test-parent.xml
index e223892b1..e223892b1 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups-docbook/qml-qdoc-test-parent.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qmlpropertygroups-docbook/qml-qdoc-test-parent.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-anotherchild-members.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-anotherchild-members.html
index 3eeea7e5e..3eeea7e5e 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-anotherchild-members.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-anotherchild-members.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-parent.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-parent.html
index 20c215f86..20c215f86 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-parent.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-parent.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/santa-14209312.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/santa-14209312.html
index f40feed36..f40feed36 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/santa-14209312.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/santa-14209312.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/santa.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/santa.html
index f40feed36..f40feed36 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/santa.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/santa.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum-docbook/scoped-enum-linking.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/scopedenum-docbook/scoped-enum-linking.xml
index f5c4a05cd..f5c4a05cd 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum-docbook/scoped-enum-linking.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/scopedenum-docbook/scoped-enum-linking.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum-docbook/testqdoc-test.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/scopedenum-docbook/testqdoc-test.xml
index 81c003fe9..81c003fe9 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum-docbook/testqdoc-test.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/scopedenum-docbook/testqdoc-test.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/scoped-enum-linking.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/scopedenum/scoped-enum-linking.html
index c6229dac2..c6229dac2 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/scoped-enum-linking.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/scopedenum/scoped-enum-linking.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/scopedenum/testqdoc-test.html
index 05a3dea20..05a3dea20 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/scopedenum/testqdoc-test.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/whatsnew.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/scopedenum/whatsnew.html
index 56e2a9783..56e2a9783 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/whatsnew.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/scopedenum/whatsnew.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/second.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/second.html
index 93f492cec..93f492cec 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/second.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/second.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/seite-mit-ausschlie-lich-gro-buchstaben-im-titel-berschrift-htm-bfa91582.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/seite-mit-ausschlie-lich-gro-buchstaben-im-titel-berschrift-htm-bfa91582.html
index 16df49755..16df49755 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/seite-mit-ausschlie-lich-gro-buchstaben-im-titel-berschrift-htm-bfa91582.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/seite-mit-ausschlie-lich-gro-buchstaben-im-titel-berschrift-htm-bfa91582.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/seite-mit-ausschlie-lich-gro-buchstaben-im-titel-berschrift-htm.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/seite-mit-ausschlie-lich-gro-buchstaben-im-titel-berschrift-htm.html
index 16df49755..16df49755 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/seite-mit-ausschlie-lich-gro-buchstaben-im-titel-berschrift-htm.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/seite-mit-ausschlie-lich-gro-buchstaben-im-titel-berschrift-htm.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/space.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/space.html
index d9007e9ff..d9007e9ff 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/space.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/space.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/tableaftervalue/tableaftervalue-members.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/tableaftervalue/tableaftervalue-members.html
index 328848c33..328848c33 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/tableaftervalue/tableaftervalue-members.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/tableaftervalue/tableaftervalue-members.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/tableaftervalue/tableaftervalue.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/tableaftervalue/tableaftervalue.html
index d27d77ef6..d27d77ef6 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/tableaftervalue/tableaftervalue.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/tableaftervalue/tableaftervalue.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/tableaftervalue/tableaftervalue.index b/src/qdoc/qdoc/tests/generatedoutput/expected_output/tableaftervalue/tableaftervalue.index
index 4f3164508..4f3164508 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/tableaftervalue/tableaftervalue.index
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/tableaftervalue/tableaftervalue.index
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/tableaftervalue/tableaftervalue.webxml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/tableaftervalue/tableaftervalue.webxml
index 9f7f5e3bb..9f7f5e3bb 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/tableaftervalue/tableaftervalue.webxml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/tableaftervalue/tableaftervalue.webxml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/tableaftervalue/tableaftervalue.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/tableaftervalue/tableaftervalue.xml
index 99b8fe13a..99b8fe13a 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/tableaftervalue/tableaftervalue.xml
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/tableaftervalue/tableaftervalue.xml
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/bar.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/template/bar.html
index 2e3c69d1f..2e3c69d1f 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/template/bar.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/template/bar.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/baz.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/template/baz.html
index 216a7c191..216a7c191 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/template/baz.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/template/baz.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/foo.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/template/foo.html
index dba89416e..dba89416e 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/template/foo.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/template/foo.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test-struct.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/template/testqdoc-test-struct.html
index 681db43f1..681db43f1 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test-struct.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/template/testqdoc-test-struct.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/template/testqdoc-test.html
index d027a48d8..d027a48d8 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/template/testqdoc-test.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-vec.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/template/testqdoc-vec.html
index fba9c899b..fba9c899b 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-vec.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/template/testqdoc-vec.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/test-cmaketest-example.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/test-cmaketest-example.html
index 9beaf4d34..9beaf4d34 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/test-cmaketest-example.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/test-cmaketest-example.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/test-componentset-example.html
index 4f0997f24..4f0997f24 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/test-componentset-example.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/test-demos-demo-example.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/test-demos-demo-example.html
index d6231c3e0..d6231c3e0 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/test-demos-demo-example.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/test-demos-demo-example.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/test-nover-qmlmodule.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/test-nover-qmlmodule.html
index c2956f99d..c2956f99d 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/test-nover-qmlmodule.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/test-nover-qmlmodule.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/test.qhp b/src/qdoc/qdoc/tests/generatedoutput/expected_output/test.qhp
index 4b4663b69..4b4663b69 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/test.qhp
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/test.qhp
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/testcpp-module.html
index 826926d59..826926d59 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/testcpp-module.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testcpp.index b/src/qdoc/qdoc/tests/generatedoutput/expected_output/testcpp.index
index ee7af0fdd..ee7af0fdd 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/testcpp.index
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/testcpp.index
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/testqdoc-test-members.html
index b07a9b327..b07a9b327 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/testqdoc-test-members.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-obsolete.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/testqdoc-test-obsolete.html
index 00ee672f5..00ee672f5 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-obsolete.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/testqdoc-test-obsolete.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/testqdoc-test.html
index 9374c865c..9374c865c 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/testqdoc-test.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-members.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/testqdoc-testderived-members.html
index c1817f392..c1817f392 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-members.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/testqdoc-testderived-members.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-obsolete.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/testqdoc-testderived-obsolete.html
index c6401ec28..c6401ec28 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-obsolete.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/testqdoc-testderived-obsolete.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/testqdoc-testderived.html
index a7187ba1a..a7187ba1a 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/testqdoc-testderived.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/testqdoc.html
index 7288e8d98..7288e8d98 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/testqdoc.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testtagfile.tags b/src/qdoc/qdoc/tests/generatedoutput/expected_output/testtagfile.tags
index 54f417728..54f417728 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/testtagfile.tags
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/testtagfile.tags
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/third.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/third.html
index cc8f68404..cc8f68404 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/third.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/third.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/toc.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/toc.html
index 5901538d0..5901538d0 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/toc.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/toc.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput-exhaustive.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput-exhaustive.html
index e9570d9ea..e9570d9ea 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput-exhaustive.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput-exhaustive.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput-linking.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput-linking.html
index 4b50d9ee2..4b50d9ee2 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput-linking.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput-linking.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput.html
index cbb55db2e..cbb55db2e 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/toc-test.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/tocbreadcrumbs/toc-test.html
index 519109bc9..519109bc9 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/toc-test.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/tocbreadcrumbs/toc-test.html
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/uicomponents-qmlmodule.html
index eae6fc6fb..eae6fc6fb 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html
+++ b/src/qdoc/qdoc/tests/generatedoutput/expected_output/uicomponents-qmlmodule.html
diff --git a/src/qdoc/qdoc/tests/generatedoutput/testdata/bug80259/inc/testmodule/TestModule.h b/src/qdoc/qdoc/tests/generatedoutput/testdata/bug80259/inc/testmodule/TestModule.h
new file mode 100644
index 000000000..90adda3e2
--- /dev/null
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/bug80259/inc/testmodule/TestModule.h
@@ -0,0 +1,6 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "aaa.h"
+#include "bbb.h"
+#include "ccc.h"
diff --git a/src/qdoc/qdoc/tests/generatedoutput/testdata/bug80259/inc/testmodule/aaa.h b/src/qdoc/qdoc/tests/generatedoutput/testdata/bug80259/inc/testmodule/aaa.h
new file mode 100644
index 000000000..5051d60a9
--- /dev/null
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/bug80259/inc/testmodule/aaa.h
@@ -0,0 +1,7 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+class Third
+{
+};
diff --git a/src/qdoc/qdoc/tests/generatedoutput/testdata/bug80259/inc/testmodule/bbb.h b/src/qdoc/qdoc/tests/generatedoutput/testdata/bug80259/inc/testmodule/bbb.h
new file mode 100644
index 000000000..c17223c2d
--- /dev/null
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/bug80259/inc/testmodule/bbb.h
@@ -0,0 +1,8 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+struct First
+{
+    class Nested {};
+};
diff --git a/src/qdoc/qdoc/tests/generatedoutput/testdata/bug80259/inc/testmodule/ccc.h b/src/qdoc/qdoc/tests/generatedoutput/testdata/bug80259/inc/testmodule/ccc.h
new file mode 100644
index 000000000..8fa00e3e8
--- /dev/null
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/bug80259/inc/testmodule/ccc.h
@@ -0,0 +1,7 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+class Second
+{
+};
diff --git a/tests/auto/qdoc/generatedoutput/testdata/bug80259/src/main.cpp b/src/qdoc/qdoc/tests/generatedoutput/testdata/bug80259/src/main.cpp
index bc92fa921..bc92fa921 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/bug80259/src/main.cpp
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/bug80259/src/main.cpp
diff --git a/src/qdoc/qdoc/tests/generatedoutput/testdata/bug80259/src/qdoc/index.qdoc b/src/qdoc/qdoc/tests/generatedoutput/testdata/bug80259/src/qdoc/index.qdoc
new file mode 100644
index 000000000..ae270f378
--- /dev/null
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/bug80259/src/qdoc/index.qdoc
@@ -0,0 +1,10 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+/*!
+    \page index.html
+    \title doc index
+
+    \generatelist {classesbymodule TestModule}
+
+*/
diff --git a/tests/auto/qdoc/generatedoutput/testdata/bug80259/testmodule.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/bug80259/testmodule.qdocconf
index 97599d0be..97599d0be 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/bug80259/testmodule.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/bug80259/testmodule.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/bug80259/webxml_testmodule.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/bug80259/webxml_testmodule.qdocconf
index dc9234fbb..dc9234fbb 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/bug80259/webxml_testmodule.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/bug80259/webxml_testmodule.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/config.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/config.qdocconf
index 4fbd70861..4fbd70861 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/config.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/config.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/docbook.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/docbook.qdocconf
index b22b190fe..b22b190fe 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/docbook.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/docbook.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/docbook_test.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/docbook_test.qdocconf
index cf9880078..cf9880078 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/docbook_test.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/docbook_test.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/docbook_testcpp.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/docbook_testcpp.qdocconf
index f2b714e00..f2b714e00 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/docbook_testcpp.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/docbook_testcpp.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/docbook_testqml.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/docbook_testqml.qdocconf
index 028690834..028690834 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/docbook_testqml.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/docbook_testqml.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/docbookext.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/docbookext.qdocconf
index c54eb11c5..c54eb11c5 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/docbookext.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/docbookext.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/docbookext_test.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/docbookext_test.qdocconf
index 233bd60bb..233bd60bb 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/docbookext_test.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/docbookext_test.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/docbookext_testcpp.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/docbookext_testcpp.qdocconf
index 19b2af6a9..19b2af6a9 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/docbookext_testcpp.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/docbookext_testcpp.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/docbookext_testqml.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/docbookext_testqml.qdocconf
index 36b22b3ad..36b22b3ad 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/docbookext_testqml.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/docbookext_testqml.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/examples-qhp.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/examples-qhp.qdocconf
index 6a32d8718..6a32d8718 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/examples-qhp.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/examples-qhp.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/headerfile.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/headerfile.qdocconf
index 9fa359b90..9fa359b90 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/headerfile.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/headerfile.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/ignoresince.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/ignoresince.qdocconf
index 019b15b3a..019b15b3a 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/ignoresince.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/ignoresince.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/nestedmacro.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/nestedmacro.qdocconf
index 1c6675475..1c6675475 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/nestedmacro.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/nestedmacro.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/noautolist.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/noautolist.qdocconf
index 16824db0e..16824db0e 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/noautolist.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/noautolist.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/properties.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/properties.qdocconf
index 3fbdbef22..3fbdbef22 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/properties.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/properties.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/scopedenum.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/scopedenum.qdocconf
index d142e07fe..d142e07fe 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/scopedenum.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/scopedenum.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/tagfiles.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/tagfiles.qdocconf
index 5e1382588..5e1382588 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/tagfiles.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/tagfiles.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/test.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/test.qdocconf
index ac70d3aef..ac70d3aef 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/test.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/test.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/testcpp.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/testcpp.qdocconf
index ec23714bf..ec23714bf 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/testcpp.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/testcpp.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/testcpp_singleexec.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/testcpp_singleexec.qdocconf
index 2ca75ea0a..2ca75ea0a 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/testcpp_singleexec.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/testcpp_singleexec.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/testglobals.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/testglobals.qdocconf
index c69ffe239..c69ffe239 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/testglobals.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/testglobals.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/testqml.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/testqml.qdocconf
index 27ff9eea5..27ff9eea5 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/testqml.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/testqml.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/testtemplate.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/testtemplate.qdocconf
index 575a30d8d..575a30d8d 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/testtemplate.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/testtemplate.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/tocbreadcrumbs.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/tocbreadcrumbs.qdocconf
index 9ecb9ed64..9ecb9ed64 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/tocbreadcrumbs.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/tocbreadcrumbs.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/tocnavigation.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/tocnavigation.qdocconf
index ba950532b..ba950532b 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/tocnavigation.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/tocnavigation.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/usingdirective.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/usingdirective.qdocconf
index d5a925b58..d5a925b58 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/usingdirective.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/usingdirective.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/webxml.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/webxml.qdocconf
index d6e6290b8..d6e6290b8 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/webxml.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/webxml.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/webxml_test.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/webxml_test.qdocconf
index 468bc42b5..468bc42b5 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/webxml_test.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/webxml_test.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/webxml_testcpp.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/webxml_testcpp.qdocconf
index dee1f4dcc..dee1f4dcc 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/webxml_testcpp.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/webxml_testcpp.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/webxml_testqml.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/webxml_testqml.qdocconf
index 537685700..537685700 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/configs/webxml_testqml.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/webxml_testqml.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/crossmodule/CrossModule b/src/qdoc/qdoc/tests/generatedoutput/testdata/crossmodule/CrossModule
index 50bea93ab..50bea93ab 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/crossmodule/CrossModule
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/crossmodule/CrossModule
diff --git a/tests/auto/qdoc/generatedoutput/testdata/crossmodule/crossmodule.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/crossmodule/crossmodule.qdocconf
index 1c16d66f8..1c16d66f8 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/crossmodule/crossmodule.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/crossmodule/crossmodule.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/crossmodule/crossmodule_singleexec.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/crossmodule/crossmodule_singleexec.qdocconf
index 1040bb5ad..1040bb5ad 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/crossmodule/crossmodule_singleexec.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/crossmodule/crossmodule_singleexec.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/crossmodule/namespaces.qdoc b/src/qdoc/qdoc/tests/generatedoutput/testdata/crossmodule/namespaces.qdoc
index 00c0f10e6..00c0f10e6 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/crossmodule/namespaces.qdoc
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/crossmodule/namespaces.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/testdata/crossmodule/testtype.cpp b/src/qdoc/qdoc/tests/generatedoutput/testdata/crossmodule/testtype.cpp
index a9323c639..a9323c639 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/crossmodule/testtype.cpp
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/crossmodule/testtype.cpp
diff --git a/tests/auto/qdoc/generatedoutput/testdata/crossmodule/testtype.h b/src/qdoc/qdoc/tests/generatedoutput/testdata/crossmodule/testtype.h
index c1209ca4b..c1209ca4b 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/crossmodule/testtype.h
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/crossmodule/testtype.h
diff --git a/tests/auto/qdoc/generatedoutput/testdata/dontdocument/TestCPP b/src/qdoc/qdoc/tests/generatedoutput/testdata/dontdocument/TestCPP
index 7291e6d8f..7291e6d8f 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/dontdocument/TestCPP
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/dontdocument/TestCPP
diff --git a/tests/auto/qdoc/generatedoutput/testdata/dontdocument/dont.cpp b/src/qdoc/qdoc/tests/generatedoutput/testdata/dontdocument/dont.cpp
index 02337e2e4..02337e2e4 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/dontdocument/dont.cpp
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/dontdocument/dont.cpp
diff --git a/tests/auto/qdoc/generatedoutput/testdata/dontdocument/dont.h b/src/qdoc/qdoc/tests/generatedoutput/testdata/dontdocument/dont.h
index 4db913e55..4db913e55 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/dontdocument/dont.h
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/dontdocument/dont.h
diff --git a/tests/auto/qdoc/generatedoutput/testdata/dontdocument/dontdocument.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/dontdocument/dontdocument.qdocconf
index ef45f50a6..ef45f50a6 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/dontdocument/dontdocument.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/dontdocument/dontdocument.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/dontdocument/test.qdoc b/src/qdoc/qdoc/tests/generatedoutput/testdata/dontdocument/test.qdoc
index d73fce531..d73fce531 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/dontdocument/test.qdoc
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/dontdocument/test.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/testdata/examples/demos/demo/demo.cpp b/src/qdoc/qdoc/tests/generatedoutput/testdata/examples/demos/demo/demo.cpp
index 906c6292f..906c6292f 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/examples/demos/demo/demo.cpp
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/examples/demos/demo/demo.cpp
diff --git a/tests/auto/qdoc/generatedoutput/testdata/examples/demos/demo/demo.pro b/src/qdoc/qdoc/tests/generatedoutput/testdata/examples/demos/demo/demo.pro
index dbe8ff3c0..dbe8ff3c0 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/examples/demos/demo/demo.pro
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/examples/demos/demo/demo.pro
diff --git a/tests/auto/qdoc/generatedoutput/testdata/examples/demos/demo/doc/src/demo.qdoc b/src/qdoc/qdoc/tests/generatedoutput/testdata/examples/demos/demo/doc/src/demo.qdoc
index 21ebc5588..21ebc5588 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/examples/demos/demo/doc/src/demo.qdoc
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/examples/demos/demo/doc/src/demo.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/testdata/examples/demos/demo/dontxclude/CMakeLists.txt b/src/qdoc/qdoc/tests/generatedoutput/testdata/examples/demos/demo/dontxclude/CMakeLists.txt
index d29157aad..d29157aad 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/examples/demos/demo/dontxclude/CMakeLists.txt
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/examples/demos/demo/dontxclude/CMakeLists.txt
diff --git a/tests/auto/qdoc/generatedoutput/testdata/examples/demos/demo/excludes/CMakeLists.txt b/src/qdoc/qdoc/tests/generatedoutput/testdata/examples/demos/demo/excludes/CMakeLists.txt
index 09b447642..09b447642 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/examples/demos/demo/excludes/CMakeLists.txt
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/examples/demos/demo/excludes/CMakeLists.txt
diff --git a/tests/auto/qdoc/generatedoutput/testdata/examples/demos/hidden/doc/src/hidden.qdoc b/src/qdoc/qdoc/tests/generatedoutput/testdata/examples/demos/hidden/doc/src/hidden.qdoc
index dddcbc074..dddcbc074 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/examples/demos/hidden/doc/src/hidden.qdoc
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/examples/demos/hidden/doc/src/hidden.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/testdata/examples/demos/hidden/hidden.pro b/src/qdoc/qdoc/tests/generatedoutput/testdata/examples/demos/hidden/hidden.pro
index dbe8ff3c0..dbe8ff3c0 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/examples/demos/hidden/hidden.pro
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/examples/demos/hidden/hidden.pro
diff --git a/tests/auto/qdoc/generatedoutput/testdata/globalfunc/TestGlobals b/src/qdoc/qdoc/tests/generatedoutput/testdata/globalfunc/TestGlobals
index dc4f98a6e..dc4f98a6e 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/globalfunc/TestGlobals
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/globalfunc/TestGlobals
diff --git a/tests/auto/qdoc/generatedoutput/testdata/globalfunc/global.h b/src/qdoc/qdoc/tests/generatedoutput/testdata/globalfunc/global.h
index 8f33ee7be..8f33ee7be 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/globalfunc/global.h
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/globalfunc/global.h
diff --git a/tests/auto/qdoc/generatedoutput/testdata/globalfunc/global.qdoc b/src/qdoc/qdoc/tests/generatedoutput/testdata/globalfunc/global.qdoc
index 24ac0fb84..24ac0fb84 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/globalfunc/global.qdoc
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/globalfunc/global.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/testdata/headerfile/testheader.cpp b/src/qdoc/qdoc/tests/generatedoutput/testdata/headerfile/testheader.cpp
index f86a1582e..f86a1582e 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/headerfile/testheader.cpp
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/headerfile/testheader.cpp
diff --git a/tests/auto/qdoc/generatedoutput/testdata/headerfile/testheader.h b/src/qdoc/qdoc/tests/generatedoutput/testdata/headerfile/testheader.h
index fcd3cb150..fcd3cb150 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/headerfile/testheader.h
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/headerfile/testheader.h
diff --git a/tests/auto/qdoc/generatedoutput/testdata/illformatted_documentation/brief_adventures.qdoc b/src/qdoc/qdoc/tests/generatedoutput/testdata/illformatted_documentation/brief_adventures.qdoc
index 9bad0106b..9bad0106b 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/illformatted_documentation/brief_adventures.qdoc
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/illformatted_documentation/brief_adventures.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/testdata/illformatted_documentation/illformatted-examples.qdoc b/src/qdoc/qdoc/tests/generatedoutput/testdata/illformatted_documentation/illformatted-examples.qdoc
index 5bfa9e7f6..5bfa9e7f6 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/illformatted_documentation/illformatted-examples.qdoc
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/illformatted_documentation/illformatted-examples.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/testdata/illformatted_documentation/illformatted_documentation.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/illformatted_documentation/illformatted_documentation.qdocconf
index a37439720..a37439720 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/illformatted_documentation/illformatted_documentation.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/illformatted_documentation/illformatted_documentation.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/illformatted_documentation/some_example.qdoc b/src/qdoc/qdoc/tests/generatedoutput/testdata/illformatted_documentation/some_example.qdoc
index a64605b87..a64605b87 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/illformatted_documentation/some_example.qdoc
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/illformatted_documentation/some_example.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/testdata/images/01.png b/src/qdoc/qdoc/tests/generatedoutput/testdata/images/01.png
index d73ab969b..d73ab969b 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/images/01.png
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/images/01.png
diff --git a/tests/auto/qdoc/generatedoutput/testdata/images/leonardo-da-vinci.png b/src/qdoc/qdoc/tests/generatedoutput/testdata/images/leonardo-da-vinci.png
index 854acb4ca..854acb4ca 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/images/leonardo-da-vinci.png
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/images/leonardo-da-vinci.png
diff --git a/tests/auto/qdoc/generatedoutput/testdata/includefromexampledirs/excludes/anotherindex.qdoc b/src/qdoc/qdoc/tests/generatedoutput/testdata/includefromexampledirs/excludes/anotherindex.qdoc
index f718d8f08..f718d8f08 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/includefromexampledirs/excludes/anotherindex.qdoc
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/includefromexampledirs/excludes/anotherindex.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/testdata/includefromexampledirs/excludes/parentinclude.qdoc b/src/qdoc/qdoc/tests/generatedoutput/testdata/includefromexampledirs/excludes/parentinclude.qdoc
index 04007ac12..04007ac12 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/includefromexampledirs/excludes/parentinclude.qdoc
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/includefromexampledirs/excludes/parentinclude.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/testdata/includefromexampledirs/includefromexampledirs.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/includefromexampledirs/includefromexampledirs.qdocconf
index d64985942..d64985942 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/includefromexampledirs/includefromexampledirs.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/includefromexampledirs/includefromexampledirs.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/includefromexampledirs/src/includefromparent.qdoc b/src/qdoc/qdoc/tests/generatedoutput/testdata/includefromexampledirs/src/includefromparent.qdoc
index ee3ccbe25..ee3ccbe25 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/includefromexampledirs/src/includefromparent.qdoc
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/includefromexampledirs/src/includefromparent.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/testdata/includefromexampledirs/src/parent.qdocinc b/src/qdoc/qdoc/tests/generatedoutput/testdata/includefromexampledirs/src/parent.qdocinc
index 307c39dbd..307c39dbd 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/includefromexampledirs/src/parent.qdocinc
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/includefromexampledirs/src/parent.qdocinc
diff --git a/tests/auto/qdoc/generatedoutput/testdata/indexlinking/indexlinking.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/indexlinking/indexlinking.qdocconf
index 55dfa6985..55dfa6985 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/indexlinking/indexlinking.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/indexlinking/indexlinking.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/indexlinking/linking.qdoc b/src/qdoc/qdoc/tests/generatedoutput/testdata/indexlinking/linking.qdoc
index fe60bc7a6..fe60bc7a6 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/indexlinking/linking.qdoc
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/indexlinking/linking.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/testdata/line_comments/line_comment_adventures.qdoc b/src/qdoc/qdoc/tests/generatedoutput/testdata/line_comments/line_comment_adventures.qdoc
index 28dfe5c90..28dfe5c90 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/line_comments/line_comment_adventures.qdoc
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/line_comments/line_comment_adventures.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/testdata/line_comments/line_comments.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/line_comments/line_comments.qdocconf
index 6d51c4abf..6d51c4abf 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/line_comments/line_comments.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/line_comments/line_comments.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/non_ascii_character_input/adventures_with_non_ascii_characters.qdoc b/src/qdoc/qdoc/tests/generatedoutput/testdata/non_ascii_character_input/adventures_with_non_ascii_characters.qdoc
index c5f09cb1c..c5f09cb1c 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/non_ascii_character_input/adventures_with_non_ascii_characters.qdoc
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/non_ascii_character_input/adventures_with_non_ascii_characters.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/testdata/non_ascii_character_input/non_ascii_character_input.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/non_ascii_character_input/non_ascii_character_input.qdocconf
index 28235c037..28235c037 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/non_ascii_character_input/non_ascii_character_input.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/non_ascii_character_input/non_ascii_character_input.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/outputfromqdocfiles/qdoctests-outputfromqdocfiles.qdoc b/src/qdoc/qdoc/tests/generatedoutput/testdata/outputfromqdocfiles/qdoctests-outputfromqdocfiles.qdoc
index 3deb39807..3deb39807 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/outputfromqdocfiles/qdoctests-outputfromqdocfiles.qdoc
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/outputfromqdocfiles/qdoctests-outputfromqdocfiles.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/testdata/outputfromqdocfiles/qdoctests-outputfromqdocmanuallikefiles.qdoc b/src/qdoc/qdoc/tests/generatedoutput/testdata/outputfromqdocfiles/qdoctests-outputfromqdocmanuallikefiles.qdoc
index 23f229745..23f229745 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/outputfromqdocfiles/qdoctests-outputfromqdocmanuallikefiles.qdoc
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/outputfromqdocfiles/qdoctests-outputfromqdocmanuallikefiles.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/testdata/proxypage/proxy.h b/src/qdoc/qdoc/tests/generatedoutput/testdata/proxypage/proxy.h
index 5d4835fc9..5d4835fc9 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/proxypage/proxy.h
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/proxypage/proxy.h
diff --git a/tests/auto/qdoc/generatedoutput/testdata/proxypage/proxy.qdoc b/src/qdoc/qdoc/tests/generatedoutput/testdata/proxypage/proxy.qdoc
index 43bf8a013..43bf8a013 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/proxypage/proxy.qdoc
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/proxypage/proxy.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/testdata/proxypage/proxypage.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/proxypage/proxypage.qdocconf
index 85f0ecd76..85f0ecd76 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/proxypage/proxypage.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/proxypage/proxypage.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/qml/DocTest.qml b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/DocTest.qml
index dfae6f13d..dfae6f13d 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/qml/DocTest.qml
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/DocTest.qml
diff --git a/tests/auto/qdoc/generatedoutput/testdata/qml/cmaketest/CMakeLists.txt b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/cmaketest/CMakeLists.txt
index 89eafa300..89eafa300 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/qml/cmaketest/CMakeLists.txt
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/cmaketest/CMakeLists.txt
diff --git a/tests/auto/qdoc/generatedoutput/testdata/qml/cmaketest/doc/src/cmaketest.qdoc b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/cmaketest/doc/src/cmaketest.qdoc
index 0e8a2ab3c..0e8a2ab3c 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/qml/cmaketest/doc/src/cmaketest.qdoc
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/cmaketest/doc/src/cmaketest.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/testdata/qml/cmaketest/main.cpp b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/cmaketest/main.cpp
index 68d71eb71..68d71eb71 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/qml/cmaketest/main.cpp
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/cmaketest/main.cpp
diff --git a/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/ProgressBar.qml b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/componentset/ProgressBar.qml
index 633a3ff5d..633a3ff5d 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/ProgressBar.qml
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/componentset/ProgressBar.qml
diff --git a/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/Switch.qml b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/componentset/Switch.qml
index 123e86468..123e86468 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/Switch.qml
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/componentset/Switch.qml
diff --git a/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/TabWidget.qml b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/componentset/TabWidget.qml
index 57808c1a5..57808c1a5 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/TabWidget.qml
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/componentset/TabWidget.qml
diff --git a/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/componentset.pro b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/componentset/componentset.pro
index 5b44737c2..5b44737c2 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/componentset.pro
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/componentset/componentset.pro
diff --git a/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/componentset/componentset.qml b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/componentset/componentset.qml
new file mode 100644
index 000000000..18b25884a
--- /dev/null
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/componentset/componentset.qml
@@ -0,0 +1,7 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+import QtQuick 2.0
+
+Item {
+}
diff --git a/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/examples.qdoc b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/componentset/examples.qdoc
index 1069c55fd..1069c55fd 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/examples.qdoc
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/componentset/examples.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/uicomponents.qdoc.sample b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/componentset/uicomponents.qdoc.sample
index efbcd9511..efbcd9511 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/uicomponents.qdoc.sample
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/componentset/uicomponents.qdoc.sample
diff --git a/tests/auto/qdoc/generatedoutput/testdata/qml/doctest/DocTest.qml b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/doctest/DocTest.qml
index 07201403f..07201403f 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/qml/doctest/DocTest.qml
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/doctest/DocTest.qml
diff --git a/tests/auto/qdoc/generatedoutput/testdata/qml/modules.qdoc b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/modules.qdoc
index f5b7614d9..f5b7614d9 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/qml/modules.qdoc
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/modules.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/testdata/qml/parent.qdoc b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/parent.qdoc
index d6bbb5738..d6bbb5738 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/qml/parent.qdoc
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/parent.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/testdata/qml/type.cpp b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/type.cpp
index 517932ae7..517932ae7 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/qml/type.cpp
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/qml/type.cpp
diff --git a/tests/auto/qdoc/generatedoutput/testdata/qmlpropertygroups/parent.qdoc b/src/qdoc/qdoc/tests/generatedoutput/testdata/qmlpropertygroups/parent.qdoc
index 4e25e8446..4e25e8446 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/qmlpropertygroups/parent.qdoc
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/qmlpropertygroups/parent.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/testdata/qmlpropertygroups/qmlpropertygroups.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/qmlpropertygroups/qmlpropertygroups.qdocconf
index 53fecd995..53fecd995 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/qmlpropertygroups/qmlpropertygroups.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/qmlpropertygroups/qmlpropertygroups.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/scopedenum/scopedenum.qdoc b/src/qdoc/qdoc/tests/generatedoutput/testdata/scopedenum/scopedenum.qdoc
index 22ef9e3f3..22ef9e3f3 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/scopedenum/scopedenum.qdoc
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/scopedenum/scopedenum.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/testdata/singleexec/singleexec.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/singleexec/singleexec.qdocconf
index 7a3354329..7a3354329 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/singleexec/singleexec.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/singleexec/singleexec.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/tables/table-after-value.cpp b/src/qdoc/qdoc/tests/generatedoutput/testdata/tables/table-after-value.cpp
index f97118194..f97118194 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/tables/table-after-value.cpp
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/tables/table-after-value.cpp
diff --git a/tests/auto/qdoc/generatedoutput/testdata/tables/table-after-value.h b/src/qdoc/qdoc/tests/generatedoutput/testdata/tables/table-after-value.h
index d667bb06b..d667bb06b 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/tables/table-after-value.h
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/tables/table-after-value.h
diff --git a/tests/auto/qdoc/generatedoutput/testdata/tables/table-after-value.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/tables/table-after-value.qdocconf
index ad64da0ab..ad64da0ab 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/tables/table-after-value.qdocconf
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/tables/table-after-value.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/testcpp/TestCPP b/src/qdoc/qdoc/tests/generatedoutput/testdata/testcpp/TestCPP
index 4ed786108..4ed786108 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/testcpp/TestCPP
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/testcpp/TestCPP
diff --git a/tests/auto/qdoc/generatedoutput/testdata/testcpp/classlists.qdoc b/src/qdoc/qdoc/tests/generatedoutput/testdata/testcpp/classlists.qdoc
index 8f6e9b6b7..8f6e9b6b7 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/testcpp/classlists.qdoc
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/testcpp/classlists.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/testdata/testcpp/properties.qdoc b/src/qdoc/qdoc/tests/generatedoutput/testdata/testcpp/properties.qdoc
index 3824ffffa..3824ffffa 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/testcpp/properties.qdoc
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/testcpp/properties.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/testdata/testcpp/snippets/snippet_testcpp.cpp b/src/qdoc/qdoc/tests/generatedoutput/testdata/testcpp/snippets/snippet_testcpp.cpp
index 1660fbc2b..1660fbc2b 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/testcpp/snippets/snippet_testcpp.cpp
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/testcpp/snippets/snippet_testcpp.cpp
diff --git a/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp b/src/qdoc/qdoc/tests/generatedoutput/testdata/testcpp/testcpp.cpp
index 68bd598d5..68bd598d5 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/testcpp/testcpp.cpp
diff --git a/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.h b/src/qdoc/qdoc/tests/generatedoutput/testdata/testcpp/testcpp.h
index 080f3b603..080f3b603 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.h
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/testcpp/testcpp.h
diff --git a/tests/auto/qdoc/generatedoutput/testdata/testtemplate/testtemplate.cpp b/src/qdoc/qdoc/tests/generatedoutput/testdata/testtemplate/testtemplate.cpp
index 04be329ea..04be329ea 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/testtemplate/testtemplate.cpp
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/testtemplate/testtemplate.cpp
diff --git a/tests/auto/qdoc/generatedoutput/testdata/testtemplate/testtemplate.h b/src/qdoc/qdoc/tests/generatedoutput/testdata/testtemplate/testtemplate.h
index 68c164e25..68c164e25 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/testtemplate/testtemplate.h
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/testtemplate/testtemplate.h
diff --git a/tests/auto/qdoc/generatedoutput/testdata/toc/toc.qdoc b/src/qdoc/qdoc/tests/generatedoutput/testdata/toc/toc.qdoc
index 6ca61de64..6ca61de64 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/toc/toc.qdoc
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/toc/toc.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/testdata/usingdirective/UsingDirective b/src/qdoc/qdoc/tests/generatedoutput/testdata/usingdirective/UsingDirective
index 422d01e91..422d01e91 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/usingdirective/UsingDirective
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/usingdirective/UsingDirective
diff --git a/src/qdoc/qdoc/tests/generatedoutput/testdata/usingdirective/alias.h b/src/qdoc/qdoc/tests/generatedoutput/testdata/usingdirective/alias.h
new file mode 100644
index 000000000..5691035da
--- /dev/null
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/usingdirective/alias.h
@@ -0,0 +1,10 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "space.h"
+
+namespace Alias {
+    using spacename = Space::spacename;
+}
diff --git a/tests/auto/qdoc/generatedoutput/testdata/usingdirective/space.cpp b/src/qdoc/qdoc/tests/generatedoutput/testdata/usingdirective/space.cpp
index 4a4962550..d84156da0 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/usingdirective/space.cpp
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/usingdirective/space.cpp
@@ -1,3 +1,6 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
 #include "space.h"
 
 /*!
diff --git a/src/qdoc/qdoc/tests/generatedoutput/testdata/usingdirective/space.h b/src/qdoc/qdoc/tests/generatedoutput/testdata/usingdirective/space.h
new file mode 100644
index 000000000..09472535c
--- /dev/null
+++ b/src/qdoc/qdoc/tests/generatedoutput/testdata/usingdirective/space.h
@@ -0,0 +1,10 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+namespace Space {
+    typedef int spacename;
+}
+
+void spaceFun(Space::spacename space);
diff --git a/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp b/src/qdoc/qdoc/tests/generatedoutput/tst_generatedoutput.cpp
index 2bd7dbc9f..2bd7dbc9f 100644
--- a/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp
+++ b/src/qdoc/qdoc/tests/generatedoutput/tst_generatedoutput.cpp
diff --git a/tests/auto/qdoc/CMakeLists.txt b/tests/auto/qdoc/CMakeLists.txt
index 07ac56cc6..553d5fcc2 100644
--- a/tests/auto/qdoc/CMakeLists.txt
+++ b/tests/auto/qdoc/CMakeLists.txt
@@ -39,6 +39,5 @@ if(QT_BUILD_STANDALONE_TESTS)
     include(${QDOC_PROJECT_DIRECTORY}/qdoc/tests/config/CMakeLists.txt)
     include(${QDOC_PROJECT_DIRECTORY}/qdoc/tests/qdoccommandlineparser/CMakeLists.txt)
     include(${QDOC_PROJECT_DIRECTORY}/qdoc/tests/utilities/CMakeLists.txt)
+    include(${QDOC_PROJECT_DIRECTORY}/qdoc/tests/generatedoutput/CMakeLists.txt)
 endif()
-
-add_subdirectory(generatedoutput)
diff --git a/tests/auto/qdoc/generatedoutput/testdata/bug80259/inc/testmodule/TestModule.h b/tests/auto/qdoc/generatedoutput/testdata/bug80259/inc/testmodule/TestModule.h
deleted file mode 100644
index 06f046a71..000000000
--- a/tests/auto/qdoc/generatedoutput/testdata/bug80259/inc/testmodule/TestModule.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "aaa.h"
-#include "bbb.h"
-#include "ccc.h"
diff --git a/tests/auto/qdoc/generatedoutput/testdata/bug80259/inc/testmodule/aaa.h b/tests/auto/qdoc/generatedoutput/testdata/bug80259/inc/testmodule/aaa.h
deleted file mode 100644
index dea5c1841..000000000
--- a/tests/auto/qdoc/generatedoutput/testdata/bug80259/inc/testmodule/aaa.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-class Third
-{
-};
diff --git a/tests/auto/qdoc/generatedoutput/testdata/bug80259/inc/testmodule/bbb.h b/tests/auto/qdoc/generatedoutput/testdata/bug80259/inc/testmodule/bbb.h
deleted file mode 100644
index ac3706e55..000000000
--- a/tests/auto/qdoc/generatedoutput/testdata/bug80259/inc/testmodule/bbb.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-struct First
-{
-    class Nested {};
-};
diff --git a/tests/auto/qdoc/generatedoutput/testdata/bug80259/inc/testmodule/ccc.h b/tests/auto/qdoc/generatedoutput/testdata/bug80259/inc/testmodule/ccc.h
deleted file mode 100644
index d3a1557e1..000000000
--- a/tests/auto/qdoc/generatedoutput/testdata/bug80259/inc/testmodule/ccc.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-class Second
-{
-};
diff --git a/tests/auto/qdoc/generatedoutput/testdata/bug80259/src/qdoc/index.qdoc b/tests/auto/qdoc/generatedoutput/testdata/bug80259/src/qdoc/index.qdoc
deleted file mode 100644
index 35ef7e087..000000000
--- a/tests/auto/qdoc/generatedoutput/testdata/bug80259/src/qdoc/index.qdoc
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
-    \page index.html
-    \title doc index
-
-    \generatelist {classesbymodule TestModule}
-
-*/
diff --git a/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/componentset.qml b/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/componentset.qml
deleted file mode 100644
index 459c82afb..000000000
--- a/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/componentset.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick 2.0
-
-Item {
-}
diff --git a/tests/auto/qdoc/generatedoutput/testdata/usingdirective/alias.h b/tests/auto/qdoc/generatedoutput/testdata/usingdirective/alias.h
deleted file mode 100644
index 1fb9ee471..000000000
--- a/tests/auto/qdoc/generatedoutput/testdata/usingdirective/alias.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "space.h"
-
-namespace Alias {
-    using spacename = Space::spacename;
-}
diff --git a/tests/auto/qdoc/generatedoutput/testdata/usingdirective/space.h b/tests/auto/qdoc/generatedoutput/testdata/usingdirective/space.h
deleted file mode 100644
index 9ac01fba6..000000000
--- a/tests/auto/qdoc/generatedoutput/testdata/usingdirective/space.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-namespace Space {
-    typedef int spacename;
-}
-
-void spaceFun(Space::spacename space);