QDoc: Move QDoc source files under a further "qdoc" directory

QDoc development under the "qttools" repository is currently performed
under the "src/qdoc" directory, which contains all source files and
directories relevant to QDoc as direct children.

Due to a slow restructuring of how QDoc works, what its dependencies are
and certain possible architectural changes, the infrastructure that is
expected to be required for the development of QDoc might increase.

Some of that infrastructure, which might require some custom effort, is
expected to be developed as "independent" "library-like" sub-projects,
which QDoc depends on.
Albeit developed "independently", such infrastructure would be developed
specifically for QDoc and thus should live "adjacent" to it.

To allow such a structure a new "qdoc" directory was added under the
"src/qdoc" directory. All source files and directory that were
previously children of the "src/qdoc" directory were moved under the new
"qdoc" directory.

This preserves the space for QDoc-related elements and the relative
project structure while allowing some space for "adjacent" projects that
are intended for QDoc specifically.

To support the change, a new "CMakeLists.txt" file was introduced under
"src/qdoc", which dispatches to the "CMakeLists.txt" file in the new
"src/qdoc/qdoc" directory.

QDoc is only built when certain dependencies are found. This is
supported through the use of Qt features at the CMake level.
The "CMakeLists.txt" file in "src", thus dispatched to the "src/qdoc"
directory only when the required features were found.
As "independent", "library-like", entities might not have the same
requirements as QDoc, the "CMakeLists.txt" file in "src" was modified to
always dispatch to the "src/qdoc" directory while the features-check was
moved to the new "CMakeLists.txt" files in "src/qdoc", so as to allow
non-QDoc but QDoc-specific project to have an independent configuration
for building.

Certain test projects in "test/auto/qdoc/" depends on QDoc-specific
source-files to generate their CMake targets.
Those dependencies were generally specified as relative paths.

The additional level in the directory structure invalidated the paths
and, hence, the relevant "CMakeLists.txt" files for those projects were
modified to correctly refer to the new directory structure.

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

169 files changed, 115 insertions, 109 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 466fca7a0..dc03e1c14 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -45,9 +45,9 @@ endif()
 if(QT_FEATURE_qtplugininfo)
     add_subdirectory(qtplugininfo)
 endif()
-if(QT_FEATURE_qdoc AND QT_FEATURE_clangcpp)
-    add_subdirectory(qdoc)
-endif()
+
+add_subdirectory(qdoc)
+
 if(QT_FEATURE_qdbus)
     add_subdirectory(qdbus)
 endif()
diff --git a/src/qdoc/CMakeLists.txt b/src/qdoc/CMakeLists.txt
index ee3516e12..c25c4a8ee 100644
--- a/src/qdoc/CMakeLists.txt
+++ b/src/qdoc/CMakeLists.txt
@@ -1,109 +1,6 @@
-# Copyright (C) 2022 The Qt Company Ltd.
+# Copyright (C) 2023 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-if(CMAKE_VERSION VERSION_LESS "3.19" AND MSVC AND CMAKE_GENERATOR STREQUAL "Ninja Multi-Config")
-    message(WARNING "qdoc will not be built in this configuration.")
-    return()
+if(QT_FEATURE_qdoc AND QT_FEATURE_clangcpp)
+    add_subdirectory(qdoc)
 endif()
-
-if (MINGW)
-    set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" PROPERTY _qt_skip_separate_debug_info ON)
-endif()
-
-
-#####################################################################
-## qdoc Tool:
-#####################################################################
-
-qt_get_tool_target_name(target_name qdoc)
-qt_internal_add_tool(${target_name}
-    TARGET_DESCRIPTION "Qt Documentation Compiler"
-    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
-    INCLUDE_DIRECTORIES
-        ${CMAKE_CURRENT_LIST_DIR}
-    LIBRARIES
-        Qt::QmlPrivate
-        WrapLibClang::WrapLibClang
-    DEFINES
-        #(CLANG_RESOURCE_DIR=\"/clang//include\") # special case remove
-        CLANG_RESOURCE_DIR=${QT_LIBCLANG_RESOURCE_DIR}
-        # To provide the ability to workaround version-specific Clang issues.
-        # A re-export of (LLVM|CLANG)_VERSION_MAJOR done in WrapLibClang.cmake
-        LIBCLANG_VERSION_MAJOR=${QT_LIB_CLANG_VERSION_MAJOR}
-        QDOC2_COMPAT
-)
-qt_internal_return_unless_building_tools()
-
-# If libclangTooling.a is not built with -fPIE enabled we cannot link it to qdoc.
-# TODO: Re-enable PIE once clang is built with PIE in provisioning.
-set_target_properties(${target_name} PROPERTIES POSITION_INDEPENDENT_CODE FALSE)
-
-qt_internal_extend_target(${target_name} CONDITION (WIN32 AND ICC) OR MSVC
-    LINK_OPTIONS
-        "/STACK:4194304"
-)
-qt_internal_add_docs(${target_name}
-    doc/config/qdoc.qdocconf
-)
diff --git a/src/qdoc/qdoc/CMakeLists.txt b/src/qdoc/qdoc/CMakeLists.txt
new file mode 100644
index 000000000..ee3516e12
--- /dev/null
+++ b/src/qdoc/qdoc/CMakeLists.txt
@@ -0,0 +1,109 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+if(CMAKE_VERSION VERSION_LESS "3.19" AND MSVC AND CMAKE_GENERATOR STREQUAL "Ninja Multi-Config")
+    message(WARNING "qdoc will not be built in this configuration.")
+    return()
+endif()
+
+if (MINGW)
+    set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" PROPERTY _qt_skip_separate_debug_info ON)
+endif()
+
+
+#####################################################################
+## qdoc Tool:
+#####################################################################
+
+qt_get_tool_target_name(target_name qdoc)
+qt_internal_add_tool(${target_name}
+    TARGET_DESCRIPTION "Qt Documentation Compiler"
+    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
+    INCLUDE_DIRECTORIES
+        ${CMAKE_CURRENT_LIST_DIR}
+    LIBRARIES
+        Qt::QmlPrivate
+        WrapLibClang::WrapLibClang
+    DEFINES
+        #(CLANG_RESOURCE_DIR=\"/clang//include\") # special case remove
+        CLANG_RESOURCE_DIR=${QT_LIBCLANG_RESOURCE_DIR}
+        # To provide the ability to workaround version-specific Clang issues.
+        # A re-export of (LLVM|CLANG)_VERSION_MAJOR done in WrapLibClang.cmake
+        LIBCLANG_VERSION_MAJOR=${QT_LIB_CLANG_VERSION_MAJOR}
+        QDOC2_COMPAT
+)
+qt_internal_return_unless_building_tools()
+
+# If libclangTooling.a is not built with -fPIE enabled we cannot link it to qdoc.
+# TODO: Re-enable PIE once clang is built with PIE in provisioning.
+set_target_properties(${target_name} PROPERTIES POSITION_INDEPENDENT_CODE FALSE)
+
+qt_internal_extend_target(${target_name} CONDITION (WIN32 AND ICC) OR MSVC
+    LINK_OPTIONS
+        "/STACK:4194304"
+)
+qt_internal_add_docs(${target_name}
+    doc/config/qdoc.qdocconf
+)
diff --git a/src/qdoc/access.h b/src/qdoc/qdoc/access.h
index 96cad686b..96cad686b 100644
--- a/src/qdoc/access.h
+++ b/src/qdoc/qdoc/access.h
diff --git a/src/qdoc/aggregate.cpp b/src/qdoc/qdoc/aggregate.cpp
index 171e92a17..171e92a17 100644
--- a/src/qdoc/aggregate.cpp
+++ b/src/qdoc/qdoc/aggregate.cpp
diff --git a/src/qdoc/aggregate.h b/src/qdoc/qdoc/aggregate.h
index eaa9ab635..eaa9ab635 100644
--- a/src/qdoc/aggregate.h
+++ b/src/qdoc/qdoc/aggregate.h
diff --git a/src/qdoc/atom.cpp b/src/qdoc/qdoc/atom.cpp
index 69bf6fb9c..69bf6fb9c 100644
--- a/src/qdoc/atom.cpp
+++ b/src/qdoc/qdoc/atom.cpp
diff --git a/src/qdoc/atom.h b/src/qdoc/qdoc/atom.h
index 1dc3806c9..1dc3806c9 100644
--- a/src/qdoc/atom.h
+++ b/src/qdoc/qdoc/atom.h
diff --git a/src/qdoc/boundaries/filesystem/directorypath.cpp b/src/qdoc/qdoc/boundaries/filesystem/directorypath.cpp
index 799582139..799582139 100644
--- a/src/qdoc/boundaries/filesystem/directorypath.cpp
+++ b/src/qdoc/qdoc/boundaries/filesystem/directorypath.cpp
diff --git a/src/qdoc/boundaries/filesystem/directorypath.h b/src/qdoc/qdoc/boundaries/filesystem/directorypath.h
index 7ec1dd415..7ec1dd415 100644
--- a/src/qdoc/boundaries/filesystem/directorypath.h
+++ b/src/qdoc/qdoc/boundaries/filesystem/directorypath.h
diff --git a/src/qdoc/boundaries/filesystem/filepath.cpp b/src/qdoc/qdoc/boundaries/filesystem/filepath.cpp
index d8964b6a6..d8964b6a6 100644
--- a/src/qdoc/boundaries/filesystem/filepath.cpp
+++ b/src/qdoc/qdoc/boundaries/filesystem/filepath.cpp
diff --git a/src/qdoc/boundaries/filesystem/filepath.h b/src/qdoc/qdoc/boundaries/filesystem/filepath.h
index 0b315ccc2..0b315ccc2 100644
--- a/src/qdoc/boundaries/filesystem/filepath.h
+++ b/src/qdoc/qdoc/boundaries/filesystem/filepath.h
diff --git a/src/qdoc/boundaries/filesystem/resolvedfile.cpp b/src/qdoc/qdoc/boundaries/filesystem/resolvedfile.cpp
index 4d5eca512..4d5eca512 100644
--- a/src/qdoc/boundaries/filesystem/resolvedfile.cpp
+++ b/src/qdoc/qdoc/boundaries/filesystem/resolvedfile.cpp
diff --git a/src/qdoc/boundaries/filesystem/resolvedfile.h b/src/qdoc/qdoc/boundaries/filesystem/resolvedfile.h
index 386ba3fce..386ba3fce 100644
--- a/src/qdoc/boundaries/filesystem/resolvedfile.h
+++ b/src/qdoc/qdoc/boundaries/filesystem/resolvedfile.h
diff --git a/src/qdoc/boundaries/refined_typedef.h b/src/qdoc/qdoc/boundaries/refined_typedef.h
index 4f3a13b7c..4f3a13b7c 100644
--- a/src/qdoc/boundaries/refined_typedef.h
+++ b/src/qdoc/qdoc/boundaries/refined_typedef.h
diff --git a/src/qdoc/boundaries/refined_typedef_members.qdocinc b/src/qdoc/qdoc/boundaries/refined_typedef_members.qdocinc
index ab956f49f..ab956f49f 100644
--- a/src/qdoc/boundaries/refined_typedef_members.qdocinc
+++ b/src/qdoc/qdoc/boundaries/refined_typedef_members.qdocinc
diff --git a/src/qdoc/clangcodeparser.cpp b/src/qdoc/qdoc/clangcodeparser.cpp
index 240e0759b..240e0759b 100644
--- a/src/qdoc/clangcodeparser.cpp
+++ b/src/qdoc/qdoc/clangcodeparser.cpp
diff --git a/src/qdoc/clangcodeparser.h b/src/qdoc/qdoc/clangcodeparser.h
index 58a340bca..58a340bca 100644
--- a/src/qdoc/clangcodeparser.h
+++ b/src/qdoc/qdoc/clangcodeparser.h
diff --git a/src/qdoc/classnode.cpp b/src/qdoc/qdoc/classnode.cpp
index f6de10f78..f6de10f78 100644
--- a/src/qdoc/classnode.cpp
+++ b/src/qdoc/qdoc/classnode.cpp
diff --git a/src/qdoc/classnode.h b/src/qdoc/qdoc/classnode.h
index d58968d2f..d58968d2f 100644
--- a/src/qdoc/classnode.h
+++ b/src/qdoc/qdoc/classnode.h
diff --git a/src/qdoc/codechunk.cpp b/src/qdoc/qdoc/codechunk.cpp
index 889e091af..889e091af 100644
--- a/src/qdoc/codechunk.cpp
+++ b/src/qdoc/qdoc/codechunk.cpp
diff --git a/src/qdoc/codechunk.h b/src/qdoc/qdoc/codechunk.h
index 00ad26c6d..00ad26c6d 100644
--- a/src/qdoc/codechunk.h
+++ b/src/qdoc/qdoc/codechunk.h
diff --git a/src/qdoc/codemarker.cpp b/src/qdoc/qdoc/codemarker.cpp
index f897f07a7..f897f07a7 100644
--- a/src/qdoc/codemarker.cpp
+++ b/src/qdoc/qdoc/codemarker.cpp
diff --git a/src/qdoc/codemarker.h b/src/qdoc/qdoc/codemarker.h
index af668b650..af668b650 100644
--- a/src/qdoc/codemarker.h
+++ b/src/qdoc/qdoc/codemarker.h
diff --git a/src/qdoc/codeparser.cpp b/src/qdoc/qdoc/codeparser.cpp
index ad35e6d65..ad35e6d65 100644
--- a/src/qdoc/codeparser.cpp
+++ b/src/qdoc/qdoc/codeparser.cpp
diff --git a/src/qdoc/codeparser.h b/src/qdoc/qdoc/codeparser.h
index 7282988f4..7282988f4 100644
--- a/src/qdoc/codeparser.h
+++ b/src/qdoc/qdoc/codeparser.h
diff --git a/src/qdoc/collectionnode.cpp b/src/qdoc/qdoc/collectionnode.cpp
index 12b9214ab..12b9214ab 100644
--- a/src/qdoc/collectionnode.cpp
+++ b/src/qdoc/qdoc/collectionnode.cpp
diff --git a/src/qdoc/collectionnode.h b/src/qdoc/qdoc/collectionnode.h
index 88abf43b6..88abf43b6 100644
--- a/src/qdoc/collectionnode.h
+++ b/src/qdoc/qdoc/collectionnode.h
diff --git a/src/qdoc/config.cpp b/src/qdoc/qdoc/config.cpp
index 5b7f9e98f..5b7f9e98f 100644
--- a/src/qdoc/config.cpp
+++ b/src/qdoc/qdoc/config.cpp
diff --git a/src/qdoc/config.h b/src/qdoc/qdoc/config.h
index 1b62f691c..1b62f691c 100644
--- a/src/qdoc/config.h
+++ b/src/qdoc/qdoc/config.h
diff --git a/src/qdoc/cppcodemarker.cpp b/src/qdoc/qdoc/cppcodemarker.cpp
index 32b14d24b..32b14d24b 100644
--- a/src/qdoc/cppcodemarker.cpp
+++ b/src/qdoc/qdoc/cppcodemarker.cpp
diff --git a/src/qdoc/cppcodemarker.h b/src/qdoc/qdoc/cppcodemarker.h
index b0c5f3615..b0c5f3615 100644
--- a/src/qdoc/cppcodemarker.h
+++ b/src/qdoc/qdoc/cppcodemarker.h
diff --git a/src/qdoc/cppcodeparser.cpp b/src/qdoc/qdoc/cppcodeparser.cpp
index 9b425114c..9b425114c 100644
--- a/src/qdoc/cppcodeparser.cpp
+++ b/src/qdoc/qdoc/cppcodeparser.cpp
diff --git a/src/qdoc/cppcodeparser.h b/src/qdoc/qdoc/cppcodeparser.h
index b312ee6e9..b312ee6e9 100644
--- a/src/qdoc/cppcodeparser.h
+++ b/src/qdoc/qdoc/cppcodeparser.h
diff --git a/src/qdoc/doc.cpp b/src/qdoc/qdoc/doc.cpp
index 762af2ebd..762af2ebd 100644
--- a/src/qdoc/doc.cpp
+++ b/src/qdoc/qdoc/doc.cpp
diff --git a/src/qdoc/doc.h b/src/qdoc/qdoc/doc.h
index a4917e3e0..a4917e3e0 100644
--- a/src/qdoc/doc.h
+++ b/src/qdoc/qdoc/doc.h
diff --git a/src/qdoc/doc/config/qdoc.qdocconf b/src/qdoc/qdoc/doc/config/qdoc.qdocconf
index 982615da9..982615da9 100644
--- a/src/qdoc/doc/config/qdoc.qdocconf
+++ b/src/qdoc/qdoc/doc/config/qdoc.qdocconf
diff --git a/src/qdoc/doc/corefeatures.qdoc b/src/qdoc/qdoc/doc/corefeatures.qdoc
index e1edc3a92..e1edc3a92 100644
--- a/src/qdoc/doc/corefeatures.qdoc
+++ b/src/qdoc/qdoc/doc/corefeatures.qdoc
diff --git a/src/qdoc/doc/examples/cpp.qdoc.sample b/src/qdoc/qdoc/doc/examples/cpp.qdoc.sample
index 39c77f63c..39c77f63c 100644
--- a/src/qdoc/doc/examples/cpp.qdoc.sample
+++ b/src/qdoc/qdoc/doc/examples/cpp.qdoc.sample
diff --git a/src/qdoc/doc/examples/layoutmanagement.qdocinc b/src/qdoc/qdoc/doc/examples/layoutmanagement.qdocinc
index 780b03c8f..780b03c8f 100644
--- a/src/qdoc/doc/examples/layoutmanagement.qdocinc
+++ b/src/qdoc/qdoc/doc/examples/layoutmanagement.qdocinc
diff --git a/src/qdoc/doc/examples/main.cpp b/src/qdoc/qdoc/doc/examples/main.cpp
index b93308ee9..b93308ee9 100644
--- a/src/qdoc/doc/examples/main.cpp
+++ b/src/qdoc/qdoc/doc/examples/main.cpp
diff --git a/src/qdoc/doc/examples/mainwindow.cpp b/src/qdoc/qdoc/doc/examples/mainwindow.cpp
index 053d429ce..053d429ce 100644
--- a/src/qdoc/doc/examples/mainwindow.cpp
+++ b/src/qdoc/qdoc/doc/examples/mainwindow.cpp
diff --git a/src/qdoc/doc/examples/minimum.qdocconf b/src/qdoc/qdoc/doc/examples/minimum.qdocconf
index 8f53ffc11..8f53ffc11 100644
--- a/src/qdoc/doc/examples/minimum.qdocconf
+++ b/src/qdoc/qdoc/doc/examples/minimum.qdocconf
diff --git a/src/qdoc/doc/examples/objectmodel.qdocinc b/src/qdoc/qdoc/doc/examples/objectmodel.qdocinc
index 02b5991c4..02b5991c4 100644
--- a/src/qdoc/doc/examples/objectmodel.qdocinc
+++ b/src/qdoc/qdoc/doc/examples/objectmodel.qdocinc
diff --git a/src/qdoc/doc/examples/qml.qdoc.sample b/src/qdoc/qdoc/doc/examples/qml.qdoc.sample
index e0f9a66b9..e0f9a66b9 100644
--- a/src/qdoc/doc/examples/qml.qdoc.sample
+++ b/src/qdoc/qdoc/doc/examples/qml.qdoc.sample
diff --git a/src/qdoc/doc/examples/samples.qdocinc b/src/qdoc/qdoc/doc/examples/samples.qdocinc
index ea257852f..ea257852f 100644
--- a/src/qdoc/doc/examples/samples.qdocinc
+++ b/src/qdoc/qdoc/doc/examples/samples.qdocinc
diff --git a/src/qdoc/doc/examples/signalandslots.qdocinc b/src/qdoc/qdoc/doc/examples/signalandslots.qdocinc
index e14ede144..e14ede144 100644
--- a/src/qdoc/doc/examples/signalandslots.qdocinc
+++ b/src/qdoc/qdoc/doc/examples/signalandslots.qdocinc
diff --git a/src/qdoc/doc/files/basicqt.qdoc.sample b/src/qdoc/qdoc/doc/files/basicqt.qdoc.sample
index 1243387b2..1243387b2 100644
--- a/src/qdoc/doc/files/basicqt.qdoc.sample
+++ b/src/qdoc/qdoc/doc/files/basicqt.qdoc.sample
diff --git a/src/qdoc/doc/files/compat.qdocconf b/src/qdoc/qdoc/doc/files/compat.qdocconf
index 94e2ffd7d..94e2ffd7d 100644
--- a/src/qdoc/doc/files/compat.qdocconf
+++ b/src/qdoc/qdoc/doc/files/compat.qdocconf
diff --git a/src/qdoc/doc/files/qtgui.qdocconf b/src/qdoc/qdoc/doc/files/qtgui.qdocconf
index ae873e83d..ae873e83d 100644
--- a/src/qdoc/doc/files/qtgui.qdocconf
+++ b/src/qdoc/qdoc/doc/files/qtgui.qdocconf
diff --git a/src/qdoc/doc/images/happy.gif b/src/qdoc/qdoc/doc/images/happy.gif
index a4597f6fa..a4597f6fa 100644
--- a/src/qdoc/doc/images/happy.gif
+++ b/src/qdoc/qdoc/doc/images/happy.gif
diff --git a/src/qdoc/doc/images/happyguy.jpg b/src/qdoc/qdoc/doc/images/happyguy.jpg
index e8604793c..e8604793c 100644
--- a/src/qdoc/doc/images/happyguy.jpg
+++ b/src/qdoc/qdoc/doc/images/happyguy.jpg
diff --git a/src/qdoc/doc/images/link-to-qquickitem.png b/src/qdoc/qdoc/doc/images/link-to-qquickitem.png
index 00e03c371..00e03c371 100644
--- a/src/qdoc/doc/images/link-to-qquickitem.png
+++ b/src/qdoc/qdoc/doc/images/link-to-qquickitem.png
diff --git a/src/qdoc/doc/images/links-to-broken-links.png b/src/qdoc/qdoc/doc/images/links-to-broken-links.png
index 775143bd4..775143bd4 100644
--- a/src/qdoc/doc/images/links-to-broken-links.png
+++ b/src/qdoc/qdoc/doc/images/links-to-broken-links.png
diff --git a/src/qdoc/doc/images/links-to-links.png b/src/qdoc/qdoc/doc/images/links-to-links.png
index 9d2cc2fae..9d2cc2fae 100644
--- a/src/qdoc/doc/images/links-to-links.png
+++ b/src/qdoc/qdoc/doc/images/links-to-links.png
diff --git a/src/qdoc/doc/images/qa-table.png b/src/qdoc/qdoc/doc/images/qa-table.png
index 5818739fa..5818739fa 100644
--- a/src/qdoc/doc/images/qa-table.png
+++ b/src/qdoc/qdoc/doc/images/qa-table.png
diff --git a/src/qdoc/doc/images/qt-logo.png b/src/qdoc/qdoc/doc/images/qt-logo.png
index 835f5a3fe..835f5a3fe 100644
--- a/src/qdoc/doc/images/qt-logo.png
+++ b/src/qdoc/qdoc/doc/images/qt-logo.png
diff --git a/src/qdoc/doc/images/training.jpg b/src/qdoc/qdoc/doc/images/training.jpg
index c2ce5c3b2..c2ce5c3b2 100644
--- a/src/qdoc/doc/images/training.jpg
+++ b/src/qdoc/qdoc/doc/images/training.jpg
diff --git a/src/qdoc/doc/images/windows-pushbutton.png b/src/qdoc/qdoc/doc/images/windows-pushbutton.png
index 14528d680..14528d680 100644
--- a/src/qdoc/doc/images/windows-pushbutton.png
+++ b/src/qdoc/qdoc/doc/images/windows-pushbutton.png
diff --git a/src/qdoc/doc/images/windows-toolbutton.png b/src/qdoc/qdoc/doc/images/windows-toolbutton.png
index 9ceb846ed..9ceb846ed 100644
--- a/src/qdoc/doc/images/windows-toolbutton.png
+++ b/src/qdoc/qdoc/doc/images/windows-toolbutton.png
diff --git a/src/qdoc/doc/qdoc-guide/qdoc-guide.qdoc b/src/qdoc/qdoc/doc/qdoc-guide/qdoc-guide.qdoc
index 086cf78ca..086cf78ca 100644
--- a/src/qdoc/doc/qdoc-guide/qdoc-guide.qdoc
+++ b/src/qdoc/qdoc/doc/qdoc-guide/qdoc-guide.qdoc
diff --git a/src/qdoc/doc/qdoc-guide/qtwritingstyle-cpp.qdoc b/src/qdoc/qdoc/doc/qdoc-guide/qtwritingstyle-cpp.qdoc
index 43387ca7e..43387ca7e 100644
--- a/src/qdoc/doc/qdoc-guide/qtwritingstyle-cpp.qdoc
+++ b/src/qdoc/qdoc/doc/qdoc-guide/qtwritingstyle-cpp.qdoc
diff --git a/src/qdoc/doc/qdoc-guide/qtwritingstyle-qml.qdoc b/src/qdoc/qdoc/doc/qdoc-guide/qtwritingstyle-qml.qdoc
index cbf76b175..cbf76b175 100644
--- a/src/qdoc/doc/qdoc-guide/qtwritingstyle-qml.qdoc
+++ b/src/qdoc/qdoc/doc/qdoc-guide/qtwritingstyle-qml.qdoc
diff --git a/src/qdoc/doc/qdoc-manual-cmdindex.qdoc b/src/qdoc/qdoc/doc/qdoc-manual-cmdindex.qdoc
index a915a9f7c..a915a9f7c 100644
--- a/src/qdoc/doc/qdoc-manual-cmdindex.qdoc
+++ b/src/qdoc/qdoc/doc/qdoc-manual-cmdindex.qdoc
diff --git a/src/qdoc/doc/qdoc-manual-contextcmds.qdoc b/src/qdoc/qdoc/doc/qdoc-manual-contextcmds.qdoc
index 821c6b0fa..821c6b0fa 100644
--- a/src/qdoc/doc/qdoc-manual-contextcmds.qdoc
+++ b/src/qdoc/qdoc/doc/qdoc-manual-contextcmds.qdoc
diff --git a/src/qdoc/doc/qdoc-manual-intro.qdoc b/src/qdoc/qdoc/doc/qdoc-manual-intro.qdoc
index 0aeb715c9..0aeb715c9 100644
--- a/src/qdoc/doc/qdoc-manual-intro.qdoc
+++ b/src/qdoc/qdoc/doc/qdoc-manual-intro.qdoc
diff --git a/src/qdoc/doc/qdoc-manual-markupcmds.qdoc b/src/qdoc/qdoc/doc/qdoc-manual-markupcmds.qdoc
index 04d9f7cc3..04d9f7cc3 100644
--- a/src/qdoc/doc/qdoc-manual-markupcmds.qdoc
+++ b/src/qdoc/qdoc/doc/qdoc-manual-markupcmds.qdoc
diff --git a/src/qdoc/doc/qdoc-manual-qdocconf.qdoc b/src/qdoc/qdoc/doc/qdoc-manual-qdocconf.qdoc
index f4fe176da..f4fe176da 100644
--- a/src/qdoc/doc/qdoc-manual-qdocconf.qdoc
+++ b/src/qdoc/qdoc/doc/qdoc-manual-qdocconf.qdoc
diff --git a/src/qdoc/doc/qdoc-manual-topiccmds.qdoc b/src/qdoc/qdoc/doc/qdoc-manual-topiccmds.qdoc
index 6d30d601c..6d30d601c 100644
--- a/src/qdoc/doc/qdoc-manual-topiccmds.qdoc
+++ b/src/qdoc/qdoc/doc/qdoc-manual-topiccmds.qdoc
diff --git a/src/qdoc/doc/qdoc-manual.qdoc b/src/qdoc/qdoc/doc/qdoc-manual.qdoc
index 898324439..898324439 100644
--- a/src/qdoc/doc/qdoc-manual.qdoc
+++ b/src/qdoc/qdoc/doc/qdoc-manual.qdoc
diff --git a/src/qdoc/doc/qdoc-minimum-qdocconf.qdoc b/src/qdoc/qdoc/doc/qdoc-minimum-qdocconf.qdoc
index f2965db1a..f2965db1a 100644
--- a/src/qdoc/doc/qdoc-minimum-qdocconf.qdoc
+++ b/src/qdoc/qdoc/doc/qdoc-minimum-qdocconf.qdoc
diff --git a/src/qdoc/doc/qdoc-warnings.qdoc b/src/qdoc/qdoc/doc/qdoc-warnings.qdoc
index 518f1255c..518f1255c 100644
--- a/src/qdoc/doc/qdoc-warnings.qdoc
+++ b/src/qdoc/qdoc/doc/qdoc-warnings.qdoc
diff --git a/src/qdoc/doc/qtgui-qdocconf.qdoc b/src/qdoc/qdoc/doc/qtgui-qdocconf.qdoc
index b72f97271..b72f97271 100644
--- a/src/qdoc/doc/qtgui-qdocconf.qdoc
+++ b/src/qdoc/qdoc/doc/qtgui-qdocconf.qdoc
diff --git a/src/qdoc/docbookgenerator.cpp b/src/qdoc/qdoc/docbookgenerator.cpp
index ceb2fa301..ceb2fa301 100644
--- a/src/qdoc/docbookgenerator.cpp
+++ b/src/qdoc/qdoc/docbookgenerator.cpp
diff --git a/src/qdoc/docbookgenerator.h b/src/qdoc/qdoc/docbookgenerator.h
index dfcbcc62c..dfcbcc62c 100644
--- a/src/qdoc/docbookgenerator.h
+++ b/src/qdoc/qdoc/docbookgenerator.h
diff --git a/src/qdoc/docparser.cpp b/src/qdoc/qdoc/docparser.cpp
index 74e9584e8..74e9584e8 100644
--- a/src/qdoc/docparser.cpp
+++ b/src/qdoc/qdoc/docparser.cpp
diff --git a/src/qdoc/docparser.h b/src/qdoc/qdoc/docparser.h
index bed6608f8..bed6608f8 100644
--- a/src/qdoc/docparser.h
+++ b/src/qdoc/qdoc/docparser.h
diff --git a/src/qdoc/docprivate.cpp b/src/qdoc/qdoc/docprivate.cpp
index a7c178d57..a7c178d57 100644
--- a/src/qdoc/docprivate.cpp
+++ b/src/qdoc/qdoc/docprivate.cpp
diff --git a/src/qdoc/docprivate.h b/src/qdoc/qdoc/docprivate.h
index 4e669bc64..4e669bc64 100644
--- a/src/qdoc/docprivate.h
+++ b/src/qdoc/qdoc/docprivate.h
diff --git a/src/qdoc/docutilities.h b/src/qdoc/qdoc/docutilities.h
index d4483ac73..d4483ac73 100644
--- a/src/qdoc/docutilities.h
+++ b/src/qdoc/qdoc/docutilities.h
diff --git a/src/qdoc/editdistance.cpp b/src/qdoc/qdoc/editdistance.cpp
index 303979ec3..303979ec3 100644
--- a/src/qdoc/editdistance.cpp
+++ b/src/qdoc/qdoc/editdistance.cpp
diff --git a/src/qdoc/editdistance.h b/src/qdoc/qdoc/editdistance.h
index dfa6a42dd..dfa6a42dd 100644
--- a/src/qdoc/editdistance.h
+++ b/src/qdoc/qdoc/editdistance.h
diff --git a/src/qdoc/enumitem.h b/src/qdoc/qdoc/enumitem.h
index 06e9d42a9..06e9d42a9 100644
--- a/src/qdoc/enumitem.h
+++ b/src/qdoc/qdoc/enumitem.h
diff --git a/src/qdoc/enumnode.cpp b/src/qdoc/qdoc/enumnode.cpp
index 48a2f81aa..48a2f81aa 100644
--- a/src/qdoc/enumnode.cpp
+++ b/src/qdoc/qdoc/enumnode.cpp
diff --git a/src/qdoc/enumnode.h b/src/qdoc/qdoc/enumnode.h
index 47139ae4d..47139ae4d 100644
--- a/src/qdoc/enumnode.h
+++ b/src/qdoc/qdoc/enumnode.h
diff --git a/src/qdoc/examplenode.h b/src/qdoc/qdoc/examplenode.h
index 920092e4e..920092e4e 100644
--- a/src/qdoc/examplenode.h
+++ b/src/qdoc/qdoc/examplenode.h
diff --git a/src/qdoc/externalpagenode.cpp b/src/qdoc/qdoc/externalpagenode.cpp
index 30a583d00..30a583d00 100644
--- a/src/qdoc/externalpagenode.cpp
+++ b/src/qdoc/qdoc/externalpagenode.cpp
diff --git a/src/qdoc/externalpagenode.h b/src/qdoc/qdoc/externalpagenode.h
index e67aab0e8..e67aab0e8 100644
--- a/src/qdoc/externalpagenode.h
+++ b/src/qdoc/qdoc/externalpagenode.h
diff --git a/src/qdoc/filesystem/fileresolver.cpp b/src/qdoc/qdoc/filesystem/fileresolver.cpp
index cd1e69452..cd1e69452 100644
--- a/src/qdoc/filesystem/fileresolver.cpp
+++ b/src/qdoc/qdoc/filesystem/fileresolver.cpp
diff --git a/src/qdoc/filesystem/fileresolver.h b/src/qdoc/qdoc/filesystem/fileresolver.h
index f1a710bcb..f1a710bcb 100644
--- a/src/qdoc/filesystem/fileresolver.h
+++ b/src/qdoc/qdoc/filesystem/fileresolver.h
diff --git a/src/qdoc/functionnode.cpp b/src/qdoc/qdoc/functionnode.cpp
index 5fda51e3b..5fda51e3b 100644
--- a/src/qdoc/functionnode.cpp
+++ b/src/qdoc/qdoc/functionnode.cpp
diff --git a/src/qdoc/functionnode.h b/src/qdoc/qdoc/functionnode.h
index 1d2ec2203..1d2ec2203 100644
--- a/src/qdoc/functionnode.h
+++ b/src/qdoc/qdoc/functionnode.h
diff --git a/src/qdoc/generator.cpp b/src/qdoc/qdoc/generator.cpp
index 9dfe88a0b..9dfe88a0b 100644
--- a/src/qdoc/generator.cpp
+++ b/src/qdoc/qdoc/generator.cpp
diff --git a/src/qdoc/generator.h b/src/qdoc/qdoc/generator.h
index 2c9be87cc..2c9be87cc 100644
--- a/src/qdoc/generator.h
+++ b/src/qdoc/qdoc/generator.h
diff --git a/src/qdoc/headernode.cpp b/src/qdoc/qdoc/headernode.cpp
index ab576fbd6..ab576fbd6 100644
--- a/src/qdoc/headernode.cpp
+++ b/src/qdoc/qdoc/headernode.cpp
diff --git a/src/qdoc/headernode.h b/src/qdoc/qdoc/headernode.h
index 36e069370..36e069370 100644
--- a/src/qdoc/headernode.h
+++ b/src/qdoc/qdoc/headernode.h
diff --git a/src/qdoc/helpprojectwriter.cpp b/src/qdoc/qdoc/helpprojectwriter.cpp
index 8c0e56b26..8c0e56b26 100644
--- a/src/qdoc/helpprojectwriter.cpp
+++ b/src/qdoc/qdoc/helpprojectwriter.cpp
diff --git a/src/qdoc/helpprojectwriter.h b/src/qdoc/qdoc/helpprojectwriter.h
index ab7339852..ab7339852 100644
--- a/src/qdoc/helpprojectwriter.h
+++ b/src/qdoc/qdoc/helpprojectwriter.h
diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/qdoc/htmlgenerator.cpp
index e3b91955c..e3b91955c 100644
--- a/src/qdoc/htmlgenerator.cpp
+++ b/src/qdoc/qdoc/htmlgenerator.cpp
diff --git a/src/qdoc/htmlgenerator.h b/src/qdoc/qdoc/htmlgenerator.h
index 3c12ce328..3c12ce328 100644
--- a/src/qdoc/htmlgenerator.h
+++ b/src/qdoc/qdoc/htmlgenerator.h
diff --git a/src/qdoc/importrec.h b/src/qdoc/qdoc/importrec.h
index 84f8f35ac..84f8f35ac 100644
--- a/src/qdoc/importrec.h
+++ b/src/qdoc/qdoc/importrec.h
diff --git a/src/qdoc/location.cpp b/src/qdoc/qdoc/location.cpp
index 714e232d7..714e232d7 100644
--- a/src/qdoc/location.cpp
+++ b/src/qdoc/qdoc/location.cpp
diff --git a/src/qdoc/location.h b/src/qdoc/qdoc/location.h
index 8427bc917..8427bc917 100644
--- a/src/qdoc/location.h
+++ b/src/qdoc/qdoc/location.h
diff --git a/src/qdoc/macro.h b/src/qdoc/qdoc/macro.h
index 11e77fa29..11e77fa29 100644
--- a/src/qdoc/macro.h
+++ b/src/qdoc/qdoc/macro.h
diff --git a/src/qdoc/main.cpp b/src/qdoc/qdoc/main.cpp
index 5b301b3c1..5b301b3c1 100644
--- a/src/qdoc/main.cpp
+++ b/src/qdoc/qdoc/main.cpp
diff --git a/src/qdoc/manifestwriter.cpp b/src/qdoc/qdoc/manifestwriter.cpp
index 69ba5de2c..69ba5de2c 100644
--- a/src/qdoc/manifestwriter.cpp
+++ b/src/qdoc/qdoc/manifestwriter.cpp
diff --git a/src/qdoc/manifestwriter.h b/src/qdoc/qdoc/manifestwriter.h
index e703f74e0..e703f74e0 100644
--- a/src/qdoc/manifestwriter.h
+++ b/src/qdoc/qdoc/manifestwriter.h
diff --git a/src/qdoc/namespacenode.cpp b/src/qdoc/qdoc/namespacenode.cpp
index 22686c050..22686c050 100644
--- a/src/qdoc/namespacenode.cpp
+++ b/src/qdoc/qdoc/namespacenode.cpp
diff --git a/src/qdoc/namespacenode.h b/src/qdoc/qdoc/namespacenode.h
index 80d068838..80d068838 100644
--- a/src/qdoc/namespacenode.h
+++ b/src/qdoc/qdoc/namespacenode.h
diff --git a/src/qdoc/node.cpp b/src/qdoc/qdoc/node.cpp
index 40bf03cbc..40bf03cbc 100644
--- a/src/qdoc/node.cpp
+++ b/src/qdoc/qdoc/node.cpp
diff --git a/src/qdoc/node.h b/src/qdoc/qdoc/node.h
index a1c2870e7..a1c2870e7 100644
--- a/src/qdoc/node.h
+++ b/src/qdoc/qdoc/node.h
diff --git a/src/qdoc/openedlist.cpp b/src/qdoc/qdoc/openedlist.cpp
index a85e45ec4..a85e45ec4 100644
--- a/src/qdoc/openedlist.cpp
+++ b/src/qdoc/qdoc/openedlist.cpp
diff --git a/src/qdoc/openedlist.h b/src/qdoc/qdoc/openedlist.h
index cd0c54e40..cd0c54e40 100644
--- a/src/qdoc/openedlist.h
+++ b/src/qdoc/qdoc/openedlist.h
diff --git a/src/qdoc/pagenode.cpp b/src/qdoc/qdoc/pagenode.cpp
index c28c3231a..c28c3231a 100644
--- a/src/qdoc/pagenode.cpp
+++ b/src/qdoc/qdoc/pagenode.cpp
diff --git a/src/qdoc/pagenode.h b/src/qdoc/qdoc/pagenode.h
index d2cfd0d17..d2cfd0d17 100644
--- a/src/qdoc/pagenode.h
+++ b/src/qdoc/qdoc/pagenode.h
diff --git a/src/qdoc/parameters.cpp b/src/qdoc/qdoc/parameters.cpp
index 39f88b48f..39f88b48f 100644
--- a/src/qdoc/parameters.cpp
+++ b/src/qdoc/qdoc/parameters.cpp
diff --git a/src/qdoc/parameters.h b/src/qdoc/qdoc/parameters.h
index 1417b0958..1417b0958 100644
--- a/src/qdoc/parameters.h
+++ b/src/qdoc/qdoc/parameters.h
diff --git a/src/qdoc/propertynode.cpp b/src/qdoc/qdoc/propertynode.cpp
index 6607af5bd..6607af5bd 100644
--- a/src/qdoc/propertynode.cpp
+++ b/src/qdoc/qdoc/propertynode.cpp
diff --git a/src/qdoc/propertynode.h b/src/qdoc/qdoc/propertynode.h
index 9ae59932b..9ae59932b 100644
--- a/src/qdoc/propertynode.h
+++ b/src/qdoc/qdoc/propertynode.h
diff --git a/src/qdoc/proxynode.cpp b/src/qdoc/qdoc/proxynode.cpp
index 49e4be34e..49e4be34e 100644
--- a/src/qdoc/proxynode.cpp
+++ b/src/qdoc/qdoc/proxynode.cpp
diff --git a/src/qdoc/proxynode.h b/src/qdoc/qdoc/proxynode.h
index cced34892..cced34892 100644
--- a/src/qdoc/proxynode.h
+++ b/src/qdoc/qdoc/proxynode.h
diff --git a/src/qdoc/puredocparser.cpp b/src/qdoc/qdoc/puredocparser.cpp
index 09dcc4839..09dcc4839 100644
--- a/src/qdoc/puredocparser.cpp
+++ b/src/qdoc/qdoc/puredocparser.cpp
diff --git a/src/qdoc/puredocparser.h b/src/qdoc/qdoc/puredocparser.h
index febfca56a..febfca56a 100644
--- a/src/qdoc/puredocparser.h
+++ b/src/qdoc/qdoc/puredocparser.h
diff --git a/src/qdoc/qdoccommandlineparser.cpp b/src/qdoc/qdoc/qdoccommandlineparser.cpp
index 6586056a4..6586056a4 100644
--- a/src/qdoc/qdoccommandlineparser.cpp
+++ b/src/qdoc/qdoc/qdoccommandlineparser.cpp
diff --git a/src/qdoc/qdoccommandlineparser.h b/src/qdoc/qdoc/qdoccommandlineparser.h
index 57b36b582..57b36b582 100644
--- a/src/qdoc/qdoccommandlineparser.h
+++ b/src/qdoc/qdoc/qdoccommandlineparser.h
diff --git a/src/qdoc/qdocdatabase.cpp b/src/qdoc/qdoc/qdocdatabase.cpp
index 91f625dbd..91f625dbd 100644
--- a/src/qdoc/qdocdatabase.cpp
+++ b/src/qdoc/qdoc/qdocdatabase.cpp
diff --git a/src/qdoc/qdocdatabase.h b/src/qdoc/qdoc/qdocdatabase.h
index 30885566d..30885566d 100644
--- a/src/qdoc/qdocdatabase.h
+++ b/src/qdoc/qdoc/qdocdatabase.h
diff --git a/src/qdoc/qdocindexfiles.cpp b/src/qdoc/qdoc/qdocindexfiles.cpp
index f4e3e9a9e..f4e3e9a9e 100644
--- a/src/qdoc/qdocindexfiles.cpp
+++ b/src/qdoc/qdoc/qdocindexfiles.cpp
diff --git a/src/qdoc/qdocindexfiles.h b/src/qdoc/qdoc/qdocindexfiles.h
index 6148c6cd2..6148c6cd2 100644
--- a/src/qdoc/qdocindexfiles.h
+++ b/src/qdoc/qdoc/qdocindexfiles.h
diff --git a/src/qdoc/qmlcodemarker.cpp b/src/qdoc/qdoc/qmlcodemarker.cpp
index 30dec979e..30dec979e 100644
--- a/src/qdoc/qmlcodemarker.cpp
+++ b/src/qdoc/qdoc/qmlcodemarker.cpp
diff --git a/src/qdoc/qmlcodemarker.h b/src/qdoc/qdoc/qmlcodemarker.h
index 64a1f7c9f..64a1f7c9f 100644
--- a/src/qdoc/qmlcodemarker.h
+++ b/src/qdoc/qdoc/qmlcodemarker.h
diff --git a/src/qdoc/qmlcodeparser.cpp b/src/qdoc/qdoc/qmlcodeparser.cpp
index fadd7c307..fadd7c307 100644
--- a/src/qdoc/qmlcodeparser.cpp
+++ b/src/qdoc/qdoc/qmlcodeparser.cpp
diff --git a/src/qdoc/qmlcodeparser.h b/src/qdoc/qdoc/qmlcodeparser.h
index dff493be4..dff493be4 100644
--- a/src/qdoc/qmlcodeparser.h
+++ b/src/qdoc/qdoc/qmlcodeparser.h
diff --git a/src/qdoc/qmlmarkupvisitor.cpp b/src/qdoc/qdoc/qmlmarkupvisitor.cpp
index 31adb838d..31adb838d 100644
--- a/src/qdoc/qmlmarkupvisitor.cpp
+++ b/src/qdoc/qdoc/qmlmarkupvisitor.cpp
diff --git a/src/qdoc/qmlmarkupvisitor.h b/src/qdoc/qdoc/qmlmarkupvisitor.h
index a19636a67..a19636a67 100644
--- a/src/qdoc/qmlmarkupvisitor.h
+++ b/src/qdoc/qdoc/qmlmarkupvisitor.h
diff --git a/src/qdoc/qmlpropertynode.cpp b/src/qdoc/qdoc/qmlpropertynode.cpp
index 034dedf25..034dedf25 100644
--- a/src/qdoc/qmlpropertynode.cpp
+++ b/src/qdoc/qdoc/qmlpropertynode.cpp
diff --git a/src/qdoc/qmlpropertynode.h b/src/qdoc/qdoc/qmlpropertynode.h
index d8bf39a8d..d8bf39a8d 100644
--- a/src/qdoc/qmlpropertynode.h
+++ b/src/qdoc/qdoc/qmlpropertynode.h
diff --git a/src/qdoc/qmltypenode.cpp b/src/qdoc/qdoc/qmltypenode.cpp
index b3ada1c45..b3ada1c45 100644
--- a/src/qdoc/qmltypenode.cpp
+++ b/src/qdoc/qdoc/qmltypenode.cpp
diff --git a/src/qdoc/qmltypenode.h b/src/qdoc/qdoc/qmltypenode.h
index d43962157..d43962157 100644
--- a/src/qdoc/qmltypenode.h
+++ b/src/qdoc/qdoc/qmltypenode.h
diff --git a/src/qdoc/qmlvisitor.cpp b/src/qdoc/qdoc/qmlvisitor.cpp
index 04e60e427..04e60e427 100644
--- a/src/qdoc/qmlvisitor.cpp
+++ b/src/qdoc/qdoc/qmlvisitor.cpp
diff --git a/src/qdoc/qmlvisitor.h b/src/qdoc/qdoc/qmlvisitor.h
index 9482c8bbf..9482c8bbf 100644
--- a/src/qdoc/qmlvisitor.h
+++ b/src/qdoc/qdoc/qmlvisitor.h
diff --git a/src/qdoc/quoter.cpp b/src/qdoc/qdoc/quoter.cpp
index 37799a9e9..37799a9e9 100644
--- a/src/qdoc/quoter.cpp
+++ b/src/qdoc/qdoc/quoter.cpp
diff --git a/src/qdoc/quoter.h b/src/qdoc/qdoc/quoter.h
index 087e9ffd2..087e9ffd2 100644
--- a/src/qdoc/quoter.h
+++ b/src/qdoc/qdoc/quoter.h
diff --git a/src/qdoc/relatedclass.cpp b/src/qdoc/qdoc/relatedclass.cpp
index 3eea8df92..3eea8df92 100644
--- a/src/qdoc/relatedclass.cpp
+++ b/src/qdoc/qdoc/relatedclass.cpp
diff --git a/src/qdoc/relatedclass.h b/src/qdoc/qdoc/relatedclass.h
index 9ca3b849a..9ca3b849a 100644
--- a/src/qdoc/relatedclass.h
+++ b/src/qdoc/qdoc/relatedclass.h
diff --git a/src/qdoc/sections.cpp b/src/qdoc/qdoc/sections.cpp
index 34fc9b372..34fc9b372 100644
--- a/src/qdoc/sections.cpp
+++ b/src/qdoc/qdoc/sections.cpp
diff --git a/src/qdoc/sections.h b/src/qdoc/qdoc/sections.h
index 70c73a91c..70c73a91c 100644
--- a/src/qdoc/sections.h
+++ b/src/qdoc/qdoc/sections.h
diff --git a/src/qdoc/sharedcommentnode.cpp b/src/qdoc/qdoc/sharedcommentnode.cpp
index 05204d1f3..05204d1f3 100644
--- a/src/qdoc/sharedcommentnode.cpp
+++ b/src/qdoc/qdoc/sharedcommentnode.cpp
diff --git a/src/qdoc/sharedcommentnode.h b/src/qdoc/qdoc/sharedcommentnode.h
index d319d7c59..d319d7c59 100644
--- a/src/qdoc/sharedcommentnode.h
+++ b/src/qdoc/qdoc/sharedcommentnode.h
diff --git a/src/qdoc/singleton.h b/src/qdoc/qdoc/singleton.h
index 085a5ea64..085a5ea64 100644
--- a/src/qdoc/singleton.h
+++ b/src/qdoc/qdoc/singleton.h
diff --git a/src/qdoc/tagfilewriter.cpp b/src/qdoc/qdoc/tagfilewriter.cpp
index bef0c693d..bef0c693d 100644
--- a/src/qdoc/tagfilewriter.cpp
+++ b/src/qdoc/qdoc/tagfilewriter.cpp
diff --git a/src/qdoc/tagfilewriter.h b/src/qdoc/qdoc/tagfilewriter.h
index 40a1ed399..40a1ed399 100644
--- a/src/qdoc/tagfilewriter.h
+++ b/src/qdoc/qdoc/tagfilewriter.h
diff --git a/src/qdoc/text.cpp b/src/qdoc/qdoc/text.cpp
index 387883109..387883109 100644
--- a/src/qdoc/text.cpp
+++ b/src/qdoc/qdoc/text.cpp
diff --git a/src/qdoc/text.h b/src/qdoc/qdoc/text.h
index aa1cb232a..aa1cb232a 100644
--- a/src/qdoc/text.h
+++ b/src/qdoc/qdoc/text.h
diff --git a/src/qdoc/tokenizer.cpp b/src/qdoc/qdoc/tokenizer.cpp
index bfbfc53c5..bfbfc53c5 100644
--- a/src/qdoc/tokenizer.cpp
+++ b/src/qdoc/qdoc/tokenizer.cpp
diff --git a/src/qdoc/tokenizer.h b/src/qdoc/qdoc/tokenizer.h
index d5669dfb7..d5669dfb7 100644
--- a/src/qdoc/tokenizer.h
+++ b/src/qdoc/qdoc/tokenizer.h
diff --git a/src/qdoc/topic.h b/src/qdoc/qdoc/topic.h
index 1f9646864..1f9646864 100644
--- a/src/qdoc/topic.h
+++ b/src/qdoc/qdoc/topic.h
diff --git a/src/qdoc/tree.cpp b/src/qdoc/qdoc/tree.cpp
index 02f422061..02f422061 100644
--- a/src/qdoc/tree.cpp
+++ b/src/qdoc/qdoc/tree.cpp
diff --git a/src/qdoc/tree.h b/src/qdoc/qdoc/tree.h
index 00c65a787..00c65a787 100644
--- a/src/qdoc/tree.h
+++ b/src/qdoc/qdoc/tree.h
diff --git a/src/qdoc/typedefnode.cpp b/src/qdoc/qdoc/typedefnode.cpp
index 997e570d3..997e570d3 100644
--- a/src/qdoc/typedefnode.cpp
+++ b/src/qdoc/qdoc/typedefnode.cpp
diff --git a/src/qdoc/typedefnode.h b/src/qdoc/qdoc/typedefnode.h
index 839cd6a0b..839cd6a0b 100644
--- a/src/qdoc/typedefnode.h
+++ b/src/qdoc/qdoc/typedefnode.h
diff --git a/src/qdoc/utilities.cpp b/src/qdoc/qdoc/utilities.cpp
index d12820d1f..d12820d1f 100644
--- a/src/qdoc/utilities.cpp
+++ b/src/qdoc/qdoc/utilities.cpp
diff --git a/src/qdoc/utilities.h b/src/qdoc/qdoc/utilities.h
index d249bcd38..d249bcd38 100644
--- a/src/qdoc/utilities.h
+++ b/src/qdoc/qdoc/utilities.h
diff --git a/src/qdoc/variablenode.cpp b/src/qdoc/qdoc/variablenode.cpp
index 11c8363f3..11c8363f3 100644
--- a/src/qdoc/variablenode.cpp
+++ b/src/qdoc/qdoc/variablenode.cpp
diff --git a/src/qdoc/variablenode.h b/src/qdoc/qdoc/variablenode.h
index 7db1252fe..7db1252fe 100644
--- a/src/qdoc/variablenode.h
+++ b/src/qdoc/qdoc/variablenode.h
diff --git a/src/qdoc/webxmlgenerator.cpp b/src/qdoc/qdoc/webxmlgenerator.cpp
index 01204da53..01204da53 100644
--- a/src/qdoc/webxmlgenerator.cpp
+++ b/src/qdoc/qdoc/webxmlgenerator.cpp
diff --git a/src/qdoc/webxmlgenerator.h b/src/qdoc/qdoc/webxmlgenerator.h
index 7065670b2..7065670b2 100644
--- a/src/qdoc/webxmlgenerator.h
+++ b/src/qdoc/qdoc/webxmlgenerator.h
diff --git a/src/qdoc/xmlgenerator.cpp b/src/qdoc/qdoc/xmlgenerator.cpp
index ff74ce2e4..ff74ce2e4 100644
--- a/src/qdoc/xmlgenerator.cpp
+++ b/src/qdoc/qdoc/xmlgenerator.cpp
diff --git a/src/qdoc/xmlgenerator.h b/src/qdoc/qdoc/xmlgenerator.h
index 5f7ba67fd..5f7ba67fd 100644
--- a/src/qdoc/xmlgenerator.h
+++ b/src/qdoc/qdoc/xmlgenerator.h