QDoc: Reorganize src/qdoc/qdoc

"src/qdoc/qdoc" contains the source code for the QDoc executable, along
with the source code for QDoc's manual.

Those files initially lived all together under "/src/qdoc", but recent
rearregement of the "qdoc" directory have moved them one level deeper,
to make space for related-but-contained sibling projects under the
"src/qdoc" directory.

Along the lines of those recent changes, and to make space for tests to be
moved under the directory, the "src/qdoc/qdoc" directory
is reoganized to follow a similar structure to other projects in its
parent.

All of qdoc source code is now moved under "src/qdoc/qdoc/src/qdoc".
The source code for QDoc's manual is left under the "doc" directory in
"src/qdoc/qdoc/", to give it more visibility and to better separate
between changes to the source-code level documentation and the
additional documentation that the project provides.

The "CMakeLists.txt" in the "src/qdoc/qdoc" directory was modified to
refer to the new paths where necessary.

The "CMakeLists.txt" in the "test/auto/qdoc/" directory, which specify
certain test targets that depend on the paths in the modified qdoc
directory, was modified to respect the new structure.

`#include` directives that were affected by the new structure have been
modified to respect the new paths.

Change-Id: I8b939889d7134863a1d1a09a96446c2076ee5e58
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

138 files changed, 78 insertions, 78 deletions

diff --git a/src/qdoc/catch_conversions/src/catch_conversions/qdoc_catch_conversions.h b/src/qdoc/catch_conversions/src/catch_conversions/qdoc_catch_conversions.h
index ef0cb2cef..d1079561b 100644
--- a/src/qdoc/catch_conversions/src/catch_conversions/qdoc_catch_conversions.h
+++ b/src/qdoc/catch_conversions/src/catch_conversions/qdoc_catch_conversions.h
@@ -5,9 +5,9 @@
 
 #include "qt_catch_conversions.h"
 
-#include <boundaries/filesystem/directorypath.h>
-#include <boundaries/filesystem/filepath.h>
-#include <boundaries/filesystem/resolvedfile.h>
+#include <qdoc/boundaries/filesystem/directorypath.h>
+#include <qdoc/boundaries/filesystem/filepath.h>
+#include <qdoc/boundaries/filesystem/resolvedfile.h>
 
 #include <ostream>
 
diff --git a/src/qdoc/qdoc/CMakeLists.txt b/src/qdoc/qdoc/CMakeLists.txt
index 05f1b4efc..81800239f 100644
--- a/src/qdoc/qdoc/CMakeLists.txt
+++ b/src/qdoc/qdoc/CMakeLists.txt
@@ -21,72 +21,72 @@ qt_internal_add_tool(${target_name}
     TOOLS_TARGET Tools
     USER_FACING
     SOURCES
-        aggregate.cpp
-        atom.cpp
-        boundaries/filesystem/directorypath.cpp
-        boundaries/filesystem/filepath.cpp
-        boundaries/filesystem/resolvedfile.cpp
-        clangcodeparser.cpp
-        classnode.cpp
-        codechunk.cpp
-        codemarker.cpp
-        codeparser.cpp
-        collectionnode.cpp
-        config.cpp
-        cppcodemarker.cpp
-        cppcodeparser.cpp
-        doc.cpp
-        docbookgenerator.cpp
-        docparser.cpp
-        docprivate.cpp
-        editdistance.cpp
-        enumnode.cpp
-        externalpagenode.cpp
-        filesystem/fileresolver.cpp
-        functionnode.cpp
-        generator.cpp
-        headernode.cpp
-        helpprojectwriter.cpp
-        htmlgenerator.cpp
-        location.cpp
-        main.cpp
-        manifestwriter.cpp
-        namespacenode.cpp
-        node.cpp
-        openedlist.cpp
-        pagenode.cpp
-        parameters.cpp
-        propertynode.cpp
-        proxynode.cpp
-        puredocparser.cpp
-        qdoccommandlineparser.cpp
-        qdocdatabase.cpp
-        qdocindexfiles.cpp
-        qmlcodemarker.cpp
-        qmlcodeparser.cpp
-        qmlmarkupvisitor.cpp
-        qmlpropertynode.cpp
-        qmltypenode.cpp
-        qmlvisitor.cpp
-        quoter.cpp
-        relatedclass.cpp
-        sections.cpp
-        sharedcommentnode.cpp
-        tagfilewriter.cpp
-        text.cpp
-        tokenizer.cpp
-        tree.cpp
-        typedefnode.cpp
-        utilities.cpp
-        variablenode.cpp
-        webxmlgenerator.cpp
-        xmlgenerator.cpp
+        src/qdoc/aggregate.cpp
+        src/qdoc/atom.cpp
+        src/qdoc/boundaries/filesystem/directorypath.cpp
+        src/qdoc/boundaries/filesystem/filepath.cpp
+        src/qdoc/boundaries/filesystem/resolvedfile.cpp
+        src/qdoc/clangcodeparser.cpp
+        src/qdoc/classnode.cpp
+        src/qdoc/codechunk.cpp
+        src/qdoc/codemarker.cpp
+        src/qdoc/codeparser.cpp
+        src/qdoc/collectionnode.cpp
+        src/qdoc/config.cpp
+        src/qdoc/cppcodemarker.cpp
+        src/qdoc/cppcodeparser.cpp
+        src/qdoc/doc.cpp
+        src/qdoc/docbookgenerator.cpp
+        src/qdoc/docparser.cpp
+        src/qdoc/docprivate.cpp
+        src/qdoc/editdistance.cpp
+        src/qdoc/enumnode.cpp
+        src/qdoc/externalpagenode.cpp
+        src/qdoc/filesystem/fileresolver.cpp
+        src/qdoc/functionnode.cpp
+        src/qdoc/generator.cpp
+        src/qdoc/headernode.cpp
+        src/qdoc/helpprojectwriter.cpp
+        src/qdoc/htmlgenerator.cpp
+        src/qdoc/location.cpp
+        src/qdoc/main.cpp
+        src/qdoc/manifestwriter.cpp
+        src/qdoc/namespacenode.cpp
+        src/qdoc/node.cpp
+        src/qdoc/openedlist.cpp
+        src/qdoc/pagenode.cpp
+        src/qdoc/parameters.cpp
+        src/qdoc/propertynode.cpp
+        src/qdoc/proxynode.cpp
+        src/qdoc/puredocparser.cpp
+        src/qdoc/qdoccommandlineparser.cpp
+        src/qdoc/qdocdatabase.cpp
+        src/qdoc/qdocindexfiles.cpp
+        src/qdoc/qmlcodemarker.cpp
+        src/qdoc/qmlcodeparser.cpp
+        src/qdoc/qmlmarkupvisitor.cpp
+        src/qdoc/qmlpropertynode.cpp
+        src/qdoc/qmltypenode.cpp
+        src/qdoc/qmlvisitor.cpp
+        src/qdoc/quoter.cpp
+        src/qdoc/relatedclass.cpp
+        src/qdoc/sections.cpp
+        src/qdoc/sharedcommentnode.cpp
+        src/qdoc/tagfilewriter.cpp
+        src/qdoc/text.cpp
+        src/qdoc/tokenizer.cpp
+        src/qdoc/tree.cpp
+        src/qdoc/typedefnode.cpp
+        src/qdoc/utilities.cpp
+        src/qdoc/variablenode.cpp
+        src/qdoc/webxmlgenerator.cpp
+        src/qdoc/xmlgenerator.cpp
     NO_UNITY_BUILD_SOURCES
-        qmlmarkupvisitor.cpp # redefinition of 'samp'/'slt' (from codemarker.cpp)
+        src/qdoc/qmlmarkupvisitor.cpp # redefinition of 'samp'/'slt' (from codemarker.cpp)
     DEFINES
         QT_NO_CONTEXTLESS_CONNECT
     INCLUDE_DIRECTORIES
-        ${CMAKE_CURRENT_LIST_DIR}
+        ${CMAKE_CURRENT_LIST_DIR}/src
     LIBRARIES
         Qt::QmlPrivate
         WrapLibClang::WrapLibClang
diff --git a/src/qdoc/qdoc/access.h b/src/qdoc/qdoc/src/qdoc/access.h
index 96cad686b..96cad686b 100644
--- a/src/qdoc/qdoc/access.h
+++ b/src/qdoc/qdoc/src/qdoc/access.h
diff --git a/src/qdoc/qdoc/aggregate.cpp b/src/qdoc/qdoc/src/qdoc/aggregate.cpp
index 171e92a17..171e92a17 100644
--- a/src/qdoc/qdoc/aggregate.cpp
+++ b/src/qdoc/qdoc/src/qdoc/aggregate.cpp
diff --git a/src/qdoc/qdoc/aggregate.h b/src/qdoc/qdoc/src/qdoc/aggregate.h
index eaa9ab635..eaa9ab635 100644
--- a/src/qdoc/qdoc/aggregate.h
+++ b/src/qdoc/qdoc/src/qdoc/aggregate.h
diff --git a/src/qdoc/qdoc/atom.cpp b/src/qdoc/qdoc/src/qdoc/atom.cpp
index 080a8fddd..080a8fddd 100644
--- a/src/qdoc/qdoc/atom.cpp
+++ b/src/qdoc/qdoc/src/qdoc/atom.cpp
diff --git a/src/qdoc/qdoc/atom.h b/src/qdoc/qdoc/src/qdoc/atom.h
index 3e642a6dd..3e642a6dd 100644
--- a/src/qdoc/qdoc/atom.h
+++ b/src/qdoc/qdoc/src/qdoc/atom.h
diff --git a/src/qdoc/qdoc/boundaries/filesystem/directorypath.cpp b/src/qdoc/qdoc/src/qdoc/boundaries/filesystem/directorypath.cpp
index 799582139..799582139 100644
--- a/src/qdoc/qdoc/boundaries/filesystem/directorypath.cpp
+++ b/src/qdoc/qdoc/src/qdoc/boundaries/filesystem/directorypath.cpp
diff --git a/src/qdoc/qdoc/boundaries/filesystem/directorypath.h b/src/qdoc/qdoc/src/qdoc/boundaries/filesystem/directorypath.h
index 7ec1dd415..7ec1dd415 100644
--- a/src/qdoc/qdoc/boundaries/filesystem/directorypath.h
+++ b/src/qdoc/qdoc/src/qdoc/boundaries/filesystem/directorypath.h
diff --git a/src/qdoc/qdoc/boundaries/filesystem/filepath.cpp b/src/qdoc/qdoc/src/qdoc/boundaries/filesystem/filepath.cpp
index d8964b6a6..d8964b6a6 100644
--- a/src/qdoc/qdoc/boundaries/filesystem/filepath.cpp
+++ b/src/qdoc/qdoc/src/qdoc/boundaries/filesystem/filepath.cpp
diff --git a/src/qdoc/qdoc/boundaries/filesystem/filepath.h b/src/qdoc/qdoc/src/qdoc/boundaries/filesystem/filepath.h
index 0b315ccc2..e8a9b2d35 100644
--- a/src/qdoc/qdoc/boundaries/filesystem/filepath.h
+++ b/src/qdoc/qdoc/src/qdoc/boundaries/filesystem/filepath.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "boundaries/refined_typedef.h"
+#include "qdoc/boundaries/refined_typedef.h"
 
 #include <optional>
 
diff --git a/src/qdoc/qdoc/boundaries/filesystem/resolvedfile.cpp b/src/qdoc/qdoc/src/qdoc/boundaries/filesystem/resolvedfile.cpp
index 4d5eca512..4d5eca512 100644
--- a/src/qdoc/qdoc/boundaries/filesystem/resolvedfile.cpp
+++ b/src/qdoc/qdoc/src/qdoc/boundaries/filesystem/resolvedfile.cpp
diff --git a/src/qdoc/qdoc/boundaries/filesystem/resolvedfile.h b/src/qdoc/qdoc/src/qdoc/boundaries/filesystem/resolvedfile.h
index 386ba3fce..e21120ab1 100644
--- a/src/qdoc/qdoc/boundaries/filesystem/resolvedfile.h
+++ b/src/qdoc/qdoc/src/qdoc/boundaries/filesystem/resolvedfile.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "boundaries/filesystem/filepath.h"
+#include "qdoc/boundaries/filesystem/filepath.h"
 
 #include <QString>
 
diff --git a/src/qdoc/qdoc/boundaries/refined_typedef.h b/src/qdoc/qdoc/src/qdoc/boundaries/refined_typedef.h
index 4f3a13b7c..4f3a13b7c 100644
--- a/src/qdoc/qdoc/boundaries/refined_typedef.h
+++ b/src/qdoc/qdoc/src/qdoc/boundaries/refined_typedef.h
diff --git a/src/qdoc/qdoc/boundaries/refined_typedef_members.qdocinc b/src/qdoc/qdoc/src/qdoc/boundaries/refined_typedef_members.qdocinc
index ab956f49f..ab956f49f 100644
--- a/src/qdoc/qdoc/boundaries/refined_typedef_members.qdocinc
+++ b/src/qdoc/qdoc/src/qdoc/boundaries/refined_typedef_members.qdocinc
diff --git a/src/qdoc/qdoc/clangcodeparser.cpp b/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp
index 240e0759b..240e0759b 100644
--- a/src/qdoc/qdoc/clangcodeparser.cpp
+++ b/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp
diff --git a/src/qdoc/qdoc/clangcodeparser.h b/src/qdoc/qdoc/src/qdoc/clangcodeparser.h
index 58a340bca..58a340bca 100644
--- a/src/qdoc/qdoc/clangcodeparser.h
+++ b/src/qdoc/qdoc/src/qdoc/clangcodeparser.h
diff --git a/src/qdoc/qdoc/classnode.cpp b/src/qdoc/qdoc/src/qdoc/classnode.cpp
index f6de10f78..f6de10f78 100644
--- a/src/qdoc/qdoc/classnode.cpp
+++ b/src/qdoc/qdoc/src/qdoc/classnode.cpp
diff --git a/src/qdoc/qdoc/classnode.h b/src/qdoc/qdoc/src/qdoc/classnode.h
index d5efe51f4..d5efe51f4 100644
--- a/src/qdoc/qdoc/classnode.h
+++ b/src/qdoc/qdoc/src/qdoc/classnode.h
diff --git a/src/qdoc/qdoc/codechunk.cpp b/src/qdoc/qdoc/src/qdoc/codechunk.cpp
index 889e091af..889e091af 100644
--- a/src/qdoc/qdoc/codechunk.cpp
+++ b/src/qdoc/qdoc/src/qdoc/codechunk.cpp
diff --git a/src/qdoc/qdoc/codechunk.h b/src/qdoc/qdoc/src/qdoc/codechunk.h
index 00ad26c6d..00ad26c6d 100644
--- a/src/qdoc/qdoc/codechunk.h
+++ b/src/qdoc/qdoc/src/qdoc/codechunk.h
diff --git a/src/qdoc/qdoc/codemarker.cpp b/src/qdoc/qdoc/src/qdoc/codemarker.cpp
index 91a2c82a0..91a2c82a0 100644
--- a/src/qdoc/qdoc/codemarker.cpp
+++ b/src/qdoc/qdoc/src/qdoc/codemarker.cpp
diff --git a/src/qdoc/qdoc/codemarker.h b/src/qdoc/qdoc/src/qdoc/codemarker.h
index af668b650..af668b650 100644
--- a/src/qdoc/qdoc/codemarker.h
+++ b/src/qdoc/qdoc/src/qdoc/codemarker.h
diff --git a/src/qdoc/qdoc/codeparser.cpp b/src/qdoc/qdoc/src/qdoc/codeparser.cpp
index ad35e6d65..ad35e6d65 100644
--- a/src/qdoc/qdoc/codeparser.cpp
+++ b/src/qdoc/qdoc/src/qdoc/codeparser.cpp
diff --git a/src/qdoc/qdoc/codeparser.h b/src/qdoc/qdoc/src/qdoc/codeparser.h
index 7282988f4..7282988f4 100644
--- a/src/qdoc/qdoc/codeparser.h
+++ b/src/qdoc/qdoc/src/qdoc/codeparser.h
diff --git a/src/qdoc/qdoc/collectionnode.cpp b/src/qdoc/qdoc/src/qdoc/collectionnode.cpp
index 12b9214ab..12b9214ab 100644
--- a/src/qdoc/qdoc/collectionnode.cpp
+++ b/src/qdoc/qdoc/src/qdoc/collectionnode.cpp
diff --git a/src/qdoc/qdoc/collectionnode.h b/src/qdoc/qdoc/src/qdoc/collectionnode.h
index 88abf43b6..88abf43b6 100644
--- a/src/qdoc/qdoc/collectionnode.h
+++ b/src/qdoc/qdoc/src/qdoc/collectionnode.h
diff --git a/src/qdoc/qdoc/config.cpp b/src/qdoc/qdoc/src/qdoc/config.cpp
index 5b7f9e98f..5b7f9e98f 100644
--- a/src/qdoc/qdoc/config.cpp
+++ b/src/qdoc/qdoc/src/qdoc/config.cpp
diff --git a/src/qdoc/qdoc/config.h b/src/qdoc/qdoc/src/qdoc/config.h
index 1b62f691c..1b62f691c 100644
--- a/src/qdoc/qdoc/config.h
+++ b/src/qdoc/qdoc/src/qdoc/config.h
diff --git a/src/qdoc/qdoc/cppcodemarker.cpp b/src/qdoc/qdoc/src/qdoc/cppcodemarker.cpp
index 32b14d24b..32b14d24b 100644
--- a/src/qdoc/qdoc/cppcodemarker.cpp
+++ b/src/qdoc/qdoc/src/qdoc/cppcodemarker.cpp
diff --git a/src/qdoc/qdoc/cppcodemarker.h b/src/qdoc/qdoc/src/qdoc/cppcodemarker.h
index b0c5f3615..b0c5f3615 100644
--- a/src/qdoc/qdoc/cppcodemarker.h
+++ b/src/qdoc/qdoc/src/qdoc/cppcodemarker.h
diff --git a/src/qdoc/qdoc/cppcodeparser.cpp b/src/qdoc/qdoc/src/qdoc/cppcodeparser.cpp
index b9609965b..b9609965b 100644
--- a/src/qdoc/qdoc/cppcodeparser.cpp
+++ b/src/qdoc/qdoc/src/qdoc/cppcodeparser.cpp
diff --git a/src/qdoc/qdoc/cppcodeparser.h b/src/qdoc/qdoc/src/qdoc/cppcodeparser.h
index b312ee6e9..b312ee6e9 100644
--- a/src/qdoc/qdoc/cppcodeparser.h
+++ b/src/qdoc/qdoc/src/qdoc/cppcodeparser.h
diff --git a/src/qdoc/qdoc/doc.cpp b/src/qdoc/qdoc/src/qdoc/doc.cpp
index c4d0e4239..c4d0e4239 100644
--- a/src/qdoc/qdoc/doc.cpp
+++ b/src/qdoc/qdoc/src/qdoc/doc.cpp
diff --git a/src/qdoc/qdoc/doc.h b/src/qdoc/qdoc/src/qdoc/doc.h
index 948c6756b..948c6756b 100644
--- a/src/qdoc/qdoc/doc.h
+++ b/src/qdoc/qdoc/src/qdoc/doc.h
diff --git a/src/qdoc/qdoc/docbookgenerator.cpp b/src/qdoc/qdoc/src/qdoc/docbookgenerator.cpp
index 490147565..490147565 100644
--- a/src/qdoc/qdoc/docbookgenerator.cpp
+++ b/src/qdoc/qdoc/src/qdoc/docbookgenerator.cpp
diff --git a/src/qdoc/qdoc/docbookgenerator.h b/src/qdoc/qdoc/src/qdoc/docbookgenerator.h
index 5defbeb82..5defbeb82 100644
--- a/src/qdoc/qdoc/docbookgenerator.h
+++ b/src/qdoc/qdoc/src/qdoc/docbookgenerator.h
diff --git a/src/qdoc/qdoc/docparser.cpp b/src/qdoc/qdoc/src/qdoc/docparser.cpp
index e33a590f7..e33a590f7 100644
--- a/src/qdoc/qdoc/docparser.cpp
+++ b/src/qdoc/qdoc/src/qdoc/docparser.cpp
diff --git a/src/qdoc/qdoc/docparser.h b/src/qdoc/qdoc/src/qdoc/docparser.h
index 4b5d75160..4b5d75160 100644
--- a/src/qdoc/qdoc/docparser.h
+++ b/src/qdoc/qdoc/src/qdoc/docparser.h
diff --git a/src/qdoc/qdoc/docprivate.cpp b/src/qdoc/qdoc/src/qdoc/docprivate.cpp
index a7c178d57..a7c178d57 100644
--- a/src/qdoc/qdoc/docprivate.cpp
+++ b/src/qdoc/qdoc/src/qdoc/docprivate.cpp
diff --git a/src/qdoc/qdoc/docprivate.h b/src/qdoc/qdoc/src/qdoc/docprivate.h
index 4e669bc64..4e669bc64 100644
--- a/src/qdoc/qdoc/docprivate.h
+++ b/src/qdoc/qdoc/src/qdoc/docprivate.h
diff --git a/src/qdoc/qdoc/docutilities.h b/src/qdoc/qdoc/src/qdoc/docutilities.h
index d4483ac73..d4483ac73 100644
--- a/src/qdoc/qdoc/docutilities.h
+++ b/src/qdoc/qdoc/src/qdoc/docutilities.h
diff --git a/src/qdoc/qdoc/editdistance.cpp b/src/qdoc/qdoc/src/qdoc/editdistance.cpp
index 303979ec3..303979ec3 100644
--- a/src/qdoc/qdoc/editdistance.cpp
+++ b/src/qdoc/qdoc/src/qdoc/editdistance.cpp
diff --git a/src/qdoc/qdoc/editdistance.h b/src/qdoc/qdoc/src/qdoc/editdistance.h
index dfa6a42dd..dfa6a42dd 100644
--- a/src/qdoc/qdoc/editdistance.h
+++ b/src/qdoc/qdoc/src/qdoc/editdistance.h
diff --git a/src/qdoc/qdoc/enumitem.h b/src/qdoc/qdoc/src/qdoc/enumitem.h
index 06e9d42a9..06e9d42a9 100644
--- a/src/qdoc/qdoc/enumitem.h
+++ b/src/qdoc/qdoc/src/qdoc/enumitem.h
diff --git a/src/qdoc/qdoc/enumnode.cpp b/src/qdoc/qdoc/src/qdoc/enumnode.cpp
index 48a2f81aa..48a2f81aa 100644
--- a/src/qdoc/qdoc/enumnode.cpp
+++ b/src/qdoc/qdoc/src/qdoc/enumnode.cpp
diff --git a/src/qdoc/qdoc/enumnode.h b/src/qdoc/qdoc/src/qdoc/enumnode.h
index 47139ae4d..47139ae4d 100644
--- a/src/qdoc/qdoc/enumnode.h
+++ b/src/qdoc/qdoc/src/qdoc/enumnode.h
diff --git a/src/qdoc/qdoc/examplenode.h b/src/qdoc/qdoc/src/qdoc/examplenode.h
index 920092e4e..920092e4e 100644
--- a/src/qdoc/qdoc/examplenode.h
+++ b/src/qdoc/qdoc/src/qdoc/examplenode.h
diff --git a/src/qdoc/qdoc/externalpagenode.cpp b/src/qdoc/qdoc/src/qdoc/externalpagenode.cpp
index 30a583d00..30a583d00 100644
--- a/src/qdoc/qdoc/externalpagenode.cpp
+++ b/src/qdoc/qdoc/src/qdoc/externalpagenode.cpp
diff --git a/src/qdoc/qdoc/externalpagenode.h b/src/qdoc/qdoc/src/qdoc/externalpagenode.h
index e67aab0e8..e67aab0e8 100644
--- a/src/qdoc/qdoc/externalpagenode.h
+++ b/src/qdoc/qdoc/src/qdoc/externalpagenode.h
diff --git a/src/qdoc/qdoc/filesystem/fileresolver.cpp b/src/qdoc/qdoc/src/qdoc/filesystem/fileresolver.cpp
index cd1e69452..aaa489085 100644
--- a/src/qdoc/qdoc/filesystem/fileresolver.cpp
+++ b/src/qdoc/qdoc/src/qdoc/filesystem/fileresolver.cpp
@@ -3,7 +3,7 @@
 
 #include "fileresolver.h"
 
-#include "boundaries/filesystem/filepath.h"
+#include "qdoc/boundaries/filesystem/filepath.h"
 
 #include <QDir>
 
diff --git a/src/qdoc/qdoc/filesystem/fileresolver.h b/src/qdoc/qdoc/src/qdoc/filesystem/fileresolver.h
index f1a710bcb..be574da30 100644
--- a/src/qdoc/qdoc/filesystem/fileresolver.h
+++ b/src/qdoc/qdoc/src/qdoc/filesystem/fileresolver.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "boundaries/filesystem/directorypath.h"
-#include "boundaries/filesystem/resolvedfile.h"
+#include "qdoc/boundaries/filesystem/directorypath.h"
+#include "qdoc/boundaries/filesystem/resolvedfile.h"
 
 #include <optional>
 #include <vector>
diff --git a/src/qdoc/qdoc/functionnode.cpp b/src/qdoc/qdoc/src/qdoc/functionnode.cpp
index 5fda51e3b..5fda51e3b 100644
--- a/src/qdoc/qdoc/functionnode.cpp
+++ b/src/qdoc/qdoc/src/qdoc/functionnode.cpp
diff --git a/src/qdoc/qdoc/functionnode.h b/src/qdoc/qdoc/src/qdoc/functionnode.h
index 1d2ec2203..1d2ec2203 100644
--- a/src/qdoc/qdoc/functionnode.h
+++ b/src/qdoc/qdoc/src/qdoc/functionnode.h
diff --git a/src/qdoc/qdoc/generator.cpp b/src/qdoc/qdoc/src/qdoc/generator.cpp
index 31f3fd63e..31f3fd63e 100644
--- a/src/qdoc/qdoc/generator.cpp
+++ b/src/qdoc/qdoc/src/qdoc/generator.cpp
diff --git a/src/qdoc/qdoc/generator.h b/src/qdoc/qdoc/src/qdoc/generator.h
index 449ea762d..449ea762d 100644
--- a/src/qdoc/qdoc/generator.h
+++ b/src/qdoc/qdoc/src/qdoc/generator.h
diff --git a/src/qdoc/qdoc/headernode.cpp b/src/qdoc/qdoc/src/qdoc/headernode.cpp
index ab576fbd6..ab576fbd6 100644
--- a/src/qdoc/qdoc/headernode.cpp
+++ b/src/qdoc/qdoc/src/qdoc/headernode.cpp
diff --git a/src/qdoc/qdoc/headernode.h b/src/qdoc/qdoc/src/qdoc/headernode.h
index b20ff8fdb..b20ff8fdb 100644
--- a/src/qdoc/qdoc/headernode.h
+++ b/src/qdoc/qdoc/src/qdoc/headernode.h
diff --git a/src/qdoc/qdoc/helpprojectwriter.cpp b/src/qdoc/qdoc/src/qdoc/helpprojectwriter.cpp
index 3ceb53add..3ceb53add 100644
--- a/src/qdoc/qdoc/helpprojectwriter.cpp
+++ b/src/qdoc/qdoc/src/qdoc/helpprojectwriter.cpp
diff --git a/src/qdoc/qdoc/helpprojectwriter.h b/src/qdoc/qdoc/src/qdoc/helpprojectwriter.h
index ab7339852..ab7339852 100644
--- a/src/qdoc/qdoc/helpprojectwriter.h
+++ b/src/qdoc/qdoc/src/qdoc/helpprojectwriter.h
diff --git a/src/qdoc/qdoc/htmlgenerator.cpp b/src/qdoc/qdoc/src/qdoc/htmlgenerator.cpp
index cb31c7300..cb31c7300 100644
--- a/src/qdoc/qdoc/htmlgenerator.cpp
+++ b/src/qdoc/qdoc/src/qdoc/htmlgenerator.cpp
diff --git a/src/qdoc/qdoc/htmlgenerator.h b/src/qdoc/qdoc/src/qdoc/htmlgenerator.h
index 6207fb7be..6207fb7be 100644
--- a/src/qdoc/qdoc/htmlgenerator.h
+++ b/src/qdoc/qdoc/src/qdoc/htmlgenerator.h
diff --git a/src/qdoc/qdoc/importrec.h b/src/qdoc/qdoc/src/qdoc/importrec.h
index 84f8f35ac..84f8f35ac 100644
--- a/src/qdoc/qdoc/importrec.h
+++ b/src/qdoc/qdoc/src/qdoc/importrec.h
diff --git a/src/qdoc/qdoc/location.cpp b/src/qdoc/qdoc/src/qdoc/location.cpp
index 714e232d7..714e232d7 100644
--- a/src/qdoc/qdoc/location.cpp
+++ b/src/qdoc/qdoc/src/qdoc/location.cpp
diff --git a/src/qdoc/qdoc/location.h b/src/qdoc/qdoc/src/qdoc/location.h
index 8427bc917..8427bc917 100644
--- a/src/qdoc/qdoc/location.h
+++ b/src/qdoc/qdoc/src/qdoc/location.h
diff --git a/src/qdoc/qdoc/macro.h b/src/qdoc/qdoc/src/qdoc/macro.h
index 11e77fa29..11e77fa29 100644
--- a/src/qdoc/qdoc/macro.h
+++ b/src/qdoc/qdoc/src/qdoc/macro.h
diff --git a/src/qdoc/qdoc/main.cpp b/src/qdoc/qdoc/src/qdoc/main.cpp
index 5b301b3c1..5b301b3c1 100644
--- a/src/qdoc/qdoc/main.cpp
+++ b/src/qdoc/qdoc/src/qdoc/main.cpp
diff --git a/src/qdoc/qdoc/manifestwriter.cpp b/src/qdoc/qdoc/src/qdoc/manifestwriter.cpp
index 97bf7f190..97bf7f190 100644
--- a/src/qdoc/qdoc/manifestwriter.cpp
+++ b/src/qdoc/qdoc/src/qdoc/manifestwriter.cpp
diff --git a/src/qdoc/qdoc/manifestwriter.h b/src/qdoc/qdoc/src/qdoc/manifestwriter.h
index 730835b9e..730835b9e 100644
--- a/src/qdoc/qdoc/manifestwriter.h
+++ b/src/qdoc/qdoc/src/qdoc/manifestwriter.h
diff --git a/src/qdoc/qdoc/namespacenode.cpp b/src/qdoc/qdoc/src/qdoc/namespacenode.cpp
index 22686c050..22686c050 100644
--- a/src/qdoc/qdoc/namespacenode.cpp
+++ b/src/qdoc/qdoc/src/qdoc/namespacenode.cpp
diff --git a/src/qdoc/qdoc/namespacenode.h b/src/qdoc/qdoc/src/qdoc/namespacenode.h
index 80d068838..80d068838 100644
--- a/src/qdoc/qdoc/namespacenode.h
+++ b/src/qdoc/qdoc/src/qdoc/namespacenode.h
diff --git a/src/qdoc/qdoc/node.cpp b/src/qdoc/qdoc/src/qdoc/node.cpp
index 26f07f95d..26f07f95d 100644
--- a/src/qdoc/qdoc/node.cpp
+++ b/src/qdoc/qdoc/src/qdoc/node.cpp
diff --git a/src/qdoc/qdoc/node.h b/src/qdoc/qdoc/src/qdoc/node.h
index a16d9305d..a16d9305d 100644
--- a/src/qdoc/qdoc/node.h
+++ b/src/qdoc/qdoc/src/qdoc/node.h
diff --git a/src/qdoc/qdoc/openedlist.cpp b/src/qdoc/qdoc/src/qdoc/openedlist.cpp
index a85e45ec4..a85e45ec4 100644
--- a/src/qdoc/qdoc/openedlist.cpp
+++ b/src/qdoc/qdoc/src/qdoc/openedlist.cpp
diff --git a/src/qdoc/qdoc/openedlist.h b/src/qdoc/qdoc/src/qdoc/openedlist.h
index cd0c54e40..cd0c54e40 100644
--- a/src/qdoc/qdoc/openedlist.h
+++ b/src/qdoc/qdoc/src/qdoc/openedlist.h
diff --git a/src/qdoc/qdoc/pagenode.cpp b/src/qdoc/qdoc/src/qdoc/pagenode.cpp
index 5f01bc24f..5f01bc24f 100644
--- a/src/qdoc/qdoc/pagenode.cpp
+++ b/src/qdoc/qdoc/src/qdoc/pagenode.cpp
diff --git a/src/qdoc/qdoc/pagenode.h b/src/qdoc/qdoc/src/qdoc/pagenode.h
index 14231bccd..14231bccd 100644
--- a/src/qdoc/qdoc/pagenode.h
+++ b/src/qdoc/qdoc/src/qdoc/pagenode.h
diff --git a/src/qdoc/qdoc/parameters.cpp b/src/qdoc/qdoc/src/qdoc/parameters.cpp
index 39f88b48f..39f88b48f 100644
--- a/src/qdoc/qdoc/parameters.cpp
+++ b/src/qdoc/qdoc/src/qdoc/parameters.cpp
diff --git a/src/qdoc/qdoc/parameters.h b/src/qdoc/qdoc/src/qdoc/parameters.h
index 1417b0958..1417b0958 100644
--- a/src/qdoc/qdoc/parameters.h
+++ b/src/qdoc/qdoc/src/qdoc/parameters.h
diff --git a/src/qdoc/qdoc/propertynode.cpp b/src/qdoc/qdoc/src/qdoc/propertynode.cpp
index 6607af5bd..6607af5bd 100644
--- a/src/qdoc/qdoc/propertynode.cpp
+++ b/src/qdoc/qdoc/src/qdoc/propertynode.cpp
diff --git a/src/qdoc/qdoc/propertynode.h b/src/qdoc/qdoc/src/qdoc/propertynode.h
index 9ae59932b..9ae59932b 100644
--- a/src/qdoc/qdoc/propertynode.h
+++ b/src/qdoc/qdoc/src/qdoc/propertynode.h
diff --git a/src/qdoc/qdoc/proxynode.cpp b/src/qdoc/qdoc/src/qdoc/proxynode.cpp
index 49e4be34e..49e4be34e 100644
--- a/src/qdoc/qdoc/proxynode.cpp
+++ b/src/qdoc/qdoc/src/qdoc/proxynode.cpp
diff --git a/src/qdoc/qdoc/proxynode.h b/src/qdoc/qdoc/src/qdoc/proxynode.h
index cced34892..cced34892 100644
--- a/src/qdoc/qdoc/proxynode.h
+++ b/src/qdoc/qdoc/src/qdoc/proxynode.h
diff --git a/src/qdoc/qdoc/puredocparser.cpp b/src/qdoc/qdoc/src/qdoc/puredocparser.cpp
index 09dcc4839..09dcc4839 100644
--- a/src/qdoc/qdoc/puredocparser.cpp
+++ b/src/qdoc/qdoc/src/qdoc/puredocparser.cpp
diff --git a/src/qdoc/qdoc/puredocparser.h b/src/qdoc/qdoc/src/qdoc/puredocparser.h
index febfca56a..febfca56a 100644
--- a/src/qdoc/qdoc/puredocparser.h
+++ b/src/qdoc/qdoc/src/qdoc/puredocparser.h
diff --git a/src/qdoc/qdoc/qdoccommandlineparser.cpp b/src/qdoc/qdoc/src/qdoc/qdoccommandlineparser.cpp
index 6586056a4..6586056a4 100644
--- a/src/qdoc/qdoc/qdoccommandlineparser.cpp
+++ b/src/qdoc/qdoc/src/qdoc/qdoccommandlineparser.cpp
diff --git a/src/qdoc/qdoc/qdoccommandlineparser.h b/src/qdoc/qdoc/src/qdoc/qdoccommandlineparser.h
index 57b36b582..57b36b582 100644
--- a/src/qdoc/qdoc/qdoccommandlineparser.h
+++ b/src/qdoc/qdoc/src/qdoc/qdoccommandlineparser.h
diff --git a/src/qdoc/qdoc/qdocdatabase.cpp b/src/qdoc/qdoc/src/qdoc/qdocdatabase.cpp
index eda5f23d5..eda5f23d5 100644
--- a/src/qdoc/qdoc/qdocdatabase.cpp
+++ b/src/qdoc/qdoc/src/qdoc/qdocdatabase.cpp
diff --git a/src/qdoc/qdoc/qdocdatabase.h b/src/qdoc/qdoc/src/qdoc/qdocdatabase.h
index d779a161e..d779a161e 100644
--- a/src/qdoc/qdoc/qdocdatabase.h
+++ b/src/qdoc/qdoc/src/qdoc/qdocdatabase.h
diff --git a/src/qdoc/qdoc/qdocindexfiles.cpp b/src/qdoc/qdoc/src/qdoc/qdocindexfiles.cpp
index 55577a183..55577a183 100644
--- a/src/qdoc/qdoc/qdocindexfiles.cpp
+++ b/src/qdoc/qdoc/src/qdoc/qdocindexfiles.cpp
diff --git a/src/qdoc/qdoc/qdocindexfiles.h b/src/qdoc/qdoc/src/qdoc/qdocindexfiles.h
index 6148c6cd2..6148c6cd2 100644
--- a/src/qdoc/qdoc/qdocindexfiles.h
+++ b/src/qdoc/qdoc/src/qdoc/qdocindexfiles.h
diff --git a/src/qdoc/qdoc/qmlcodemarker.cpp b/src/qdoc/qdoc/src/qdoc/qmlcodemarker.cpp
index 30dec979e..30dec979e 100644
--- a/src/qdoc/qdoc/qmlcodemarker.cpp
+++ b/src/qdoc/qdoc/src/qdoc/qmlcodemarker.cpp
diff --git a/src/qdoc/qdoc/qmlcodemarker.h b/src/qdoc/qdoc/src/qdoc/qmlcodemarker.h
index 64a1f7c9f..64a1f7c9f 100644
--- a/src/qdoc/qdoc/qmlcodemarker.h
+++ b/src/qdoc/qdoc/src/qdoc/qmlcodemarker.h
diff --git a/src/qdoc/qdoc/qmlcodeparser.cpp b/src/qdoc/qdoc/src/qdoc/qmlcodeparser.cpp
index fadd7c307..fadd7c307 100644
--- a/src/qdoc/qdoc/qmlcodeparser.cpp
+++ b/src/qdoc/qdoc/src/qdoc/qmlcodeparser.cpp
diff --git a/src/qdoc/qdoc/qmlcodeparser.h b/src/qdoc/qdoc/src/qdoc/qmlcodeparser.h
index dff493be4..dff493be4 100644
--- a/src/qdoc/qdoc/qmlcodeparser.h
+++ b/src/qdoc/qdoc/src/qdoc/qmlcodeparser.h
diff --git a/src/qdoc/qdoc/qmlmarkupvisitor.cpp b/src/qdoc/qdoc/src/qdoc/qmlmarkupvisitor.cpp
index 31adb838d..31adb838d 100644
--- a/src/qdoc/qdoc/qmlmarkupvisitor.cpp
+++ b/src/qdoc/qdoc/src/qdoc/qmlmarkupvisitor.cpp
diff --git a/src/qdoc/qdoc/qmlmarkupvisitor.h b/src/qdoc/qdoc/src/qdoc/qmlmarkupvisitor.h
index a19636a67..a19636a67 100644
--- a/src/qdoc/qdoc/qmlmarkupvisitor.h
+++ b/src/qdoc/qdoc/src/qdoc/qmlmarkupvisitor.h
diff --git a/src/qdoc/qdoc/qmlpropertynode.cpp b/src/qdoc/qdoc/src/qdoc/qmlpropertynode.cpp
index a8aaf1257..a8aaf1257 100644
--- a/src/qdoc/qdoc/qmlpropertynode.cpp
+++ b/src/qdoc/qdoc/src/qdoc/qmlpropertynode.cpp
diff --git a/src/qdoc/qdoc/qmlpropertynode.h b/src/qdoc/qdoc/src/qdoc/qmlpropertynode.h
index fec5ff89f..fec5ff89f 100644
--- a/src/qdoc/qdoc/qmlpropertynode.h
+++ b/src/qdoc/qdoc/src/qdoc/qmlpropertynode.h
diff --git a/src/qdoc/qdoc/qmltypenode.cpp b/src/qdoc/qdoc/src/qdoc/qmltypenode.cpp
index 4285f9b6e..4285f9b6e 100644
--- a/src/qdoc/qdoc/qmltypenode.cpp
+++ b/src/qdoc/qdoc/src/qdoc/qmltypenode.cpp
diff --git a/src/qdoc/qdoc/qmltypenode.h b/src/qdoc/qdoc/src/qdoc/qmltypenode.h
index fd18a2294..fd18a2294 100644
--- a/src/qdoc/qdoc/qmltypenode.h
+++ b/src/qdoc/qdoc/src/qdoc/qmltypenode.h
diff --git a/src/qdoc/qdoc/qmlvisitor.cpp b/src/qdoc/qdoc/src/qdoc/qmlvisitor.cpp
index 61b176da4..61b176da4 100644
--- a/src/qdoc/qdoc/qmlvisitor.cpp
+++ b/src/qdoc/qdoc/src/qdoc/qmlvisitor.cpp
diff --git a/src/qdoc/qdoc/qmlvisitor.h b/src/qdoc/qdoc/src/qdoc/qmlvisitor.h
index 201dc0e61..201dc0e61 100644
--- a/src/qdoc/qdoc/qmlvisitor.h
+++ b/src/qdoc/qdoc/src/qdoc/qmlvisitor.h
diff --git a/src/qdoc/qdoc/quoter.cpp b/src/qdoc/qdoc/src/qdoc/quoter.cpp
index 37799a9e9..37799a9e9 100644
--- a/src/qdoc/qdoc/quoter.cpp
+++ b/src/qdoc/qdoc/src/qdoc/quoter.cpp
diff --git a/src/qdoc/qdoc/quoter.h b/src/qdoc/qdoc/src/qdoc/quoter.h
index 087e9ffd2..087e9ffd2 100644
--- a/src/qdoc/qdoc/quoter.h
+++ b/src/qdoc/qdoc/src/qdoc/quoter.h
diff --git a/src/qdoc/qdoc/relatedclass.cpp b/src/qdoc/qdoc/src/qdoc/relatedclass.cpp
index 3eea8df92..3eea8df92 100644
--- a/src/qdoc/qdoc/relatedclass.cpp
+++ b/src/qdoc/qdoc/src/qdoc/relatedclass.cpp
diff --git a/src/qdoc/qdoc/relatedclass.h b/src/qdoc/qdoc/src/qdoc/relatedclass.h
index 9ca3b849a..9ca3b849a 100644
--- a/src/qdoc/qdoc/relatedclass.h
+++ b/src/qdoc/qdoc/src/qdoc/relatedclass.h
diff --git a/src/qdoc/qdoc/sections.cpp b/src/qdoc/qdoc/src/qdoc/sections.cpp
index 34fc9b372..34fc9b372 100644
--- a/src/qdoc/qdoc/sections.cpp
+++ b/src/qdoc/qdoc/src/qdoc/sections.cpp
diff --git a/src/qdoc/qdoc/sections.h b/src/qdoc/qdoc/src/qdoc/sections.h
index 70c73a91c..70c73a91c 100644
--- a/src/qdoc/qdoc/sections.h
+++ b/src/qdoc/qdoc/src/qdoc/sections.h
diff --git a/src/qdoc/qdoc/sharedcommentnode.cpp b/src/qdoc/qdoc/src/qdoc/sharedcommentnode.cpp
index 05204d1f3..05204d1f3 100644
--- a/src/qdoc/qdoc/sharedcommentnode.cpp
+++ b/src/qdoc/qdoc/src/qdoc/sharedcommentnode.cpp
diff --git a/src/qdoc/qdoc/sharedcommentnode.h b/src/qdoc/qdoc/src/qdoc/sharedcommentnode.h
index d319d7c59..d319d7c59 100644
--- a/src/qdoc/qdoc/sharedcommentnode.h
+++ b/src/qdoc/qdoc/src/qdoc/sharedcommentnode.h
diff --git a/src/qdoc/qdoc/singleton.h b/src/qdoc/qdoc/src/qdoc/singleton.h
index 085a5ea64..085a5ea64 100644
--- a/src/qdoc/qdoc/singleton.h
+++ b/src/qdoc/qdoc/src/qdoc/singleton.h
diff --git a/src/qdoc/qdoc/tagfilewriter.cpp b/src/qdoc/qdoc/src/qdoc/tagfilewriter.cpp
index bef0c693d..bef0c693d 100644
--- a/src/qdoc/qdoc/tagfilewriter.cpp
+++ b/src/qdoc/qdoc/src/qdoc/tagfilewriter.cpp
diff --git a/src/qdoc/qdoc/tagfilewriter.h b/src/qdoc/qdoc/src/qdoc/tagfilewriter.h
index 40a1ed399..40a1ed399 100644
--- a/src/qdoc/qdoc/tagfilewriter.h
+++ b/src/qdoc/qdoc/src/qdoc/tagfilewriter.h
diff --git a/src/qdoc/qdoc/text.cpp b/src/qdoc/qdoc/src/qdoc/text.cpp
index 387883109..387883109 100644
--- a/src/qdoc/qdoc/text.cpp
+++ b/src/qdoc/qdoc/src/qdoc/text.cpp
diff --git a/src/qdoc/qdoc/text.h b/src/qdoc/qdoc/src/qdoc/text.h
index aa1cb232a..aa1cb232a 100644
--- a/src/qdoc/qdoc/text.h
+++ b/src/qdoc/qdoc/src/qdoc/text.h
diff --git a/src/qdoc/qdoc/tokenizer.cpp b/src/qdoc/qdoc/src/qdoc/tokenizer.cpp
index bfbfc53c5..bfbfc53c5 100644
--- a/src/qdoc/qdoc/tokenizer.cpp
+++ b/src/qdoc/qdoc/src/qdoc/tokenizer.cpp
diff --git a/src/qdoc/qdoc/tokenizer.h b/src/qdoc/qdoc/src/qdoc/tokenizer.h
index d5669dfb7..d5669dfb7 100644
--- a/src/qdoc/qdoc/tokenizer.h
+++ b/src/qdoc/qdoc/src/qdoc/tokenizer.h
diff --git a/src/qdoc/qdoc/topic.h b/src/qdoc/qdoc/src/qdoc/topic.h
index 1f9646864..1f9646864 100644
--- a/src/qdoc/qdoc/topic.h
+++ b/src/qdoc/qdoc/src/qdoc/topic.h
diff --git a/src/qdoc/qdoc/tree.cpp b/src/qdoc/qdoc/src/qdoc/tree.cpp
index 900b299c3..900b299c3 100644
--- a/src/qdoc/qdoc/tree.cpp
+++ b/src/qdoc/qdoc/src/qdoc/tree.cpp
diff --git a/src/qdoc/qdoc/tree.h b/src/qdoc/qdoc/src/qdoc/tree.h
index 00c65a787..00c65a787 100644
--- a/src/qdoc/qdoc/tree.h
+++ b/src/qdoc/qdoc/src/qdoc/tree.h
diff --git a/src/qdoc/qdoc/typedefnode.cpp b/src/qdoc/qdoc/src/qdoc/typedefnode.cpp
index 997e570d3..997e570d3 100644
--- a/src/qdoc/qdoc/typedefnode.cpp
+++ b/src/qdoc/qdoc/src/qdoc/typedefnode.cpp
diff --git a/src/qdoc/qdoc/typedefnode.h b/src/qdoc/qdoc/src/qdoc/typedefnode.h
index 839cd6a0b..839cd6a0b 100644
--- a/src/qdoc/qdoc/typedefnode.h
+++ b/src/qdoc/qdoc/src/qdoc/typedefnode.h
diff --git a/src/qdoc/qdoc/utilities.cpp b/src/qdoc/qdoc/src/qdoc/utilities.cpp
index 2825804d6..2825804d6 100644
--- a/src/qdoc/qdoc/utilities.cpp
+++ b/src/qdoc/qdoc/src/qdoc/utilities.cpp
diff --git a/src/qdoc/qdoc/utilities.h b/src/qdoc/qdoc/src/qdoc/utilities.h
index 0d485f650..0d485f650 100644
--- a/src/qdoc/qdoc/utilities.h
+++ b/src/qdoc/qdoc/src/qdoc/utilities.h
diff --git a/src/qdoc/qdoc/variablenode.cpp b/src/qdoc/qdoc/src/qdoc/variablenode.cpp
index 11c8363f3..11c8363f3 100644
--- a/src/qdoc/qdoc/variablenode.cpp
+++ b/src/qdoc/qdoc/src/qdoc/variablenode.cpp
diff --git a/src/qdoc/qdoc/variablenode.h b/src/qdoc/qdoc/src/qdoc/variablenode.h
index 7db1252fe..7db1252fe 100644
--- a/src/qdoc/qdoc/variablenode.h
+++ b/src/qdoc/qdoc/src/qdoc/variablenode.h
diff --git a/src/qdoc/qdoc/webxmlgenerator.cpp b/src/qdoc/qdoc/src/qdoc/webxmlgenerator.cpp
index 674ae000a..674ae000a 100644
--- a/src/qdoc/qdoc/webxmlgenerator.cpp
+++ b/src/qdoc/qdoc/src/qdoc/webxmlgenerator.cpp
diff --git a/src/qdoc/qdoc/webxmlgenerator.h b/src/qdoc/qdoc/src/qdoc/webxmlgenerator.h
index 7065670b2..7065670b2 100644
--- a/src/qdoc/qdoc/webxmlgenerator.h
+++ b/src/qdoc/qdoc/src/qdoc/webxmlgenerator.h
diff --git a/src/qdoc/qdoc/xmlgenerator.cpp b/src/qdoc/qdoc/src/qdoc/xmlgenerator.cpp
index ff74ce2e4..ff74ce2e4 100644
--- a/src/qdoc/qdoc/xmlgenerator.cpp
+++ b/src/qdoc/qdoc/src/qdoc/xmlgenerator.cpp
diff --git a/src/qdoc/qdoc/xmlgenerator.h b/src/qdoc/qdoc/src/qdoc/xmlgenerator.h
index 5f7ba67fd..5f7ba67fd 100644
--- a/src/qdoc/qdoc/xmlgenerator.h
+++ b/src/qdoc/qdoc/src/qdoc/xmlgenerator.h
diff --git a/tests/auto/qdoc/CMakeLists.txt b/tests/auto/qdoc/CMakeLists.txt
index 08e79d8bf..5d2edc42f 100644
--- a/tests/auto/qdoc/CMakeLists.txt
+++ b/tests/auto/qdoc/CMakeLists.txt
@@ -7,8 +7,8 @@ if(CMAKE_VERSION VERSION_LESS "3.19" AND MSVC AND QT_FEATURE_debug_and_release)
 endif()
 
 set(QDOC_PROJECT_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../../../src/qdoc/)
-set(QDOC_SOURCE_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../../../src/qdoc/qdoc/)
-set(QDOC_INCLUDE_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../../../src/qdoc/qdoc/)
+set(QDOC_SOURCE_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../../../src/qdoc/qdoc/src/qdoc)
+set(QDOC_INCLUDE_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../../../src/qdoc/qdoc/src/)
 
 if(QT_BUILD_STANDALONE_TESTS)
     include(${QDOC_PROJECT_DIRECTORY}/catch_generators/tests/CMakeLists.txt)
diff --git a/tests/auto/qdoc/config/tst_config.cpp b/tests/auto/qdoc/config/tst_config.cpp
index ac69f3b51..cf51d25bf 100644
--- a/tests/auto/qdoc/config/tst_config.cpp
+++ b/tests/auto/qdoc/config/tst_config.cpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2020 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "config.h"
+#include "qdoc/config.h"
 
 #include <QtCore/qdir.h>
 #include <QtCore/qfileinfo.h>
diff --git a/tests/auto/qdoc/qdoc/boundaries/filesystem/catch_directorypath.cpp b/tests/auto/qdoc/qdoc/boundaries/filesystem/catch_directorypath.cpp
index 31a45bfa4..9daa88a11 100644
--- a/tests/auto/qdoc/qdoc/boundaries/filesystem/catch_directorypath.cpp
+++ b/tests/auto/qdoc/qdoc/boundaries/filesystem/catch_directorypath.cpp
@@ -5,7 +5,7 @@
 
 #include <catch/catch.hpp>
 
-#include <boundaries/filesystem/directorypath.h>
+#include <qdoc/boundaries/filesystem/directorypath.h>
 
 #include <catch_generators/generators/path_generator.h>
 
diff --git a/tests/auto/qdoc/qdoc/boundaries/filesystem/catch_filepath.cpp b/tests/auto/qdoc/qdoc/boundaries/filesystem/catch_filepath.cpp
index 957a13127..487ce4ffb 100644
--- a/tests/auto/qdoc/qdoc/boundaries/filesystem/catch_filepath.cpp
+++ b/tests/auto/qdoc/qdoc/boundaries/filesystem/catch_filepath.cpp
@@ -5,7 +5,7 @@
 
 #include <catch/catch.hpp>
 
-#include <boundaries/filesystem/filepath.h>
+#include <qdoc/boundaries/filesystem/filepath.h>
 
 #include <catch_generators/generators/path_generator.h>
 
diff --git a/tests/auto/qdoc/qdoc/filesystem/catch_fileresolver.cpp b/tests/auto/qdoc/qdoc/filesystem/catch_fileresolver.cpp
index 75774c9cc..5746be77f 100644
--- a/tests/auto/qdoc/qdoc/filesystem/catch_fileresolver.cpp
+++ b/tests/auto/qdoc/qdoc/filesystem/catch_fileresolver.cpp
@@ -5,7 +5,7 @@
 
 #include <catch/catch.hpp>
 
-#include <filesystem/fileresolver.h>
+#include <qdoc/filesystem/fileresolver.h>
 
 #include <catch_generators/generators/path_generator.h>
 
diff --git a/tests/auto/qdoc/qdoccommandlineparser/tst_qdoccommandlineparser.cpp b/tests/auto/qdoc/qdoccommandlineparser/tst_qdoccommandlineparser.cpp
index 4634d5ff9..524f8d889 100644
--- a/tests/auto/qdoc/qdoccommandlineparser/tst_qdoccommandlineparser.cpp
+++ b/tests/auto/qdoc/qdoccommandlineparser/tst_qdoccommandlineparser.cpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2020 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "qdoccommandlineparser.h"
+#include "qdoc/qdoccommandlineparser.h"
 
 #include <QtCore/qstringlist.h>
 #include <QtTest/QtTest>
diff --git a/tests/auto/qdoc/utilities/tst_utilities.cpp b/tests/auto/qdoc/utilities/tst_utilities.cpp
index 7838af610..0f092d383 100644
--- a/tests/auto/qdoc/utilities/tst_utilities.cpp
+++ b/tests/auto/qdoc/utilities/tst_utilities.cpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2020 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "utilities.h"
+#include "qdoc/utilities.h"
 
 #include <QtTest/QtTest>