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>

4 files changed, 15 insertions, 15 deletions

diff --git a/tests/auto/qdoc/config/CMakeLists.txt b/tests/auto/qdoc/config/CMakeLists.txt
index 9836fb1f0..b1d132e48 100644
--- a/tests/auto/qdoc/config/CMakeLists.txt
+++ b/tests/auto/qdoc/config/CMakeLists.txt
@@ -7,11 +7,11 @@
 
 qt_internal_add_test(tst_config
     SOURCES
-        ../../../../src/qdoc/config.cpp ../../../../src/qdoc/config.h
-        ../../../../src/qdoc/location.cpp ../../../../src/qdoc/location.h
-        ../../../../src/qdoc/qdoccommandlineparser.cpp ../../../../src/qdoc/qdoccommandlineparser.h
-        ../../../../src/qdoc/utilities.cpp ../../../../src/qdoc/utilities.h
+        ../../../../src/qdoc/qdoc/config.cpp ../../../../src/qdoc/qdoc/config.h
+        ../../../../src/qdoc/qdoc/location.cpp ../../../../src/qdoc/qdoc/location.h
+        ../../../../src/qdoc/qdoc/qdoccommandlineparser.cpp ../../../../src/qdoc/qdoc/qdoccommandlineparser.h
+        ../../../../src/qdoc/qdoc/utilities.cpp ../../../../src/qdoc/qdoc/utilities.h
         tst_config.cpp
     INCLUDE_DIRECTORIES
-        ../../../../src/qdoc
+        ../../../../src/qdoc/qdoc
 )
diff --git a/tests/auto/qdoc/qdoc/CMakeLists.txt b/tests/auto/qdoc/qdoc/CMakeLists.txt
index 489555f25..9c3897305 100644
--- a/tests/auto/qdoc/qdoc/CMakeLists.txt
+++ b/tests/auto/qdoc/qdoc/CMakeLists.txt
@@ -9,12 +9,12 @@ qt_internal_add_test(tst_QDoc
     boundaries/filesystem/catch_directorypath.cpp
     filesystem/catch_fileresolver.cpp
 
-    ../../../../src/qdoc/boundaries/filesystem/filepath.cpp
-    ../../../../src/qdoc/boundaries/filesystem/directorypath.cpp
-    ../../../../src/qdoc/boundaries/filesystem/resolvedfile.cpp
-    ../../../../src/qdoc/filesystem/fileresolver.cpp
+    ../../../../src/qdoc/qdoc/boundaries/filesystem/filepath.cpp
+    ../../../../src/qdoc/qdoc/boundaries/filesystem/directorypath.cpp
+    ../../../../src/qdoc/qdoc/boundaries/filesystem/resolvedfile.cpp
+    ../../../../src/qdoc/qdoc/filesystem/fileresolver.cpp
   INCLUDE_DIRECTORIES
-    ../../../../src/qdoc/
+    ../../../../src/qdoc/qdoc/
     ../catch/
     ../catch_generators/
     ../catch_conversions/
diff --git a/tests/auto/qdoc/qdoccommandlineparser/CMakeLists.txt b/tests/auto/qdoc/qdoccommandlineparser/CMakeLists.txt
index 1ebe4f3e2..ef0103f11 100644
--- a/tests/auto/qdoc/qdoccommandlineparser/CMakeLists.txt
+++ b/tests/auto/qdoc/qdoccommandlineparser/CMakeLists.txt
@@ -9,11 +9,11 @@
 qt_internal_add_test(tst_qdoccommandlineparser
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
     SOURCES
-        ../../../../src/qdoc/qdoccommandlineparser.cpp ../../../../src/qdoc/qdoccommandlineparser.h
-        ../../../../src/qdoc/utilities.cpp ../../../../src/qdoc/utilities.h
+        ../../../../src/qdoc/qdoc/qdoccommandlineparser.cpp ../../../../src/qdoc/qdoc/qdoccommandlineparser.h
+        ../../../../src/qdoc/qdoc/utilities.cpp ../../../../src/qdoc/qdoc/utilities.h
         tst_qdoccommandlineparser.cpp
     INCLUDE_DIRECTORIES
-        ../../../../src/qdoc
+        ../../../../src/qdoc/qdoc
 )
 
 # Resources:
diff --git a/tests/auto/qdoc/utilities/CMakeLists.txt b/tests/auto/qdoc/utilities/CMakeLists.txt
index 17615e1a6..a23eff6e9 100644
--- a/tests/auto/qdoc/utilities/CMakeLists.txt
+++ b/tests/auto/qdoc/utilities/CMakeLists.txt
@@ -7,8 +7,8 @@
 
 qt_internal_add_test(tst_utilities
     SOURCES
-        ../../../../src/qdoc/utilities.cpp ../../../../src/qdoc/utilities.h
+        ../../../../src/qdoc/qdoc/utilities.cpp ../../../../src/qdoc/qdoc/utilities.h
         tst_utilities.cpp
     INCLUDE_DIRECTORIES
-        ../../../../src/qdoc
+        ../../../../src/qdoc/qdoc
 )