QDoc: Add structure to E2E test data

Ensure that test data is properly separated from test configuration
and expected output by moving test data into a `src`
subdirectory. This has an added benefit of ensuring uniform structure
for all test cases.

Task-number: QTBUG-119500
Change-Id: Iea8bc1d84f1b80b6b7f77a23330793d4cfa78891
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>

121 files changed, 88 insertions, 95 deletions

diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/bug80259/bug80259.qdocconf b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/bug80259/bug80259.qdocconf
index 4a8b906be..2b7a1e5f4 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/bug80259/bug80259.qdocconf
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/bug80259/bug80259.qdocconf
@@ -2,9 +2,9 @@ project = TestModule
 
 moduleheader = TestModule.h
 
-headerdirs = ./inc
+headerdirs = ./src/inc
 sourcedirs = ./src
-includepaths += ./inc/testmodule
+includepaths += ./src/inc/testmodule
 
 sources.fileextensions = "*.cpp *.qdoc"
 headers.fileextensions = "*.h"
@@ -13,7 +13,7 @@ outputdir = doc
 outputformats = HTML WebXML
 
 # images
-imagedirs = ../images
+imagedirs = ./src/images
 
 # zero warning policy
 warninglimit = 0
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/bug80259/inc/testmodule/TestModule.h b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/bug80259/src/inc/testmodule/TestModule.h
index 90adda3e2..90adda3e2 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/bug80259/inc/testmodule/TestModule.h
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/bug80259/src/inc/testmodule/TestModule.h
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/bug80259/inc/testmodule/aaa.h b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/bug80259/src/inc/testmodule/aaa.h
index 5051d60a9..5051d60a9 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/bug80259/inc/testmodule/aaa.h
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/bug80259/src/inc/testmodule/aaa.h
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/bug80259/inc/testmodule/bbb.h b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/bug80259/src/inc/testmodule/bbb.h
index c17223c2d..c17223c2d 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/bug80259/inc/testmodule/bbb.h
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/bug80259/src/inc/testmodule/bbb.h
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/bug80259/inc/testmodule/ccc.h b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/bug80259/src/inc/testmodule/ccc.h
index 8fa00e3e8..8fa00e3e8 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/bug80259/inc/testmodule/ccc.h
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/bug80259/src/inc/testmodule/ccc.h
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/cmakedocumentation/cmakedocumentation.qdocconf b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/cmakedocumentation/cmakedocumentation.qdocconf
index cd9517704..c62f4938e 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/cmakedocumentation/cmakedocumentation.qdocconf
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/cmakedocumentation/cmakedocumentation.qdocconf
@@ -1,8 +1,8 @@
 project = cmakedocumentation
 
-headerdirs  = .
-sourcedirs  = .
-exampledirs = .
+headerdirs  = ./src
+sourcedirs  = ./src
+exampledirs = ./src
 
 outputformats             = WebXML HTML DocBook
 WebXML.quotinginformation = true
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/cmakedocumentation/car.cpp b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/cmakedocumentation/src/car.cpp
index 78823d7e3..78823d7e3 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/cmakedocumentation/car.cpp
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/cmakedocumentation/src/car.cpp
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/cmakedocumentation/car.h b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/cmakedocumentation/src/car.h
index c0203b07c..c0203b07c 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/cmakedocumentation/car.h
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/cmakedocumentation/src/car.h
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/comprehensiveproject.qdocconf b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/comprehensiveproject.qdocconf
index 77c8a3287..e6751e2b7 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/comprehensiveproject.qdocconf
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/comprehensiveproject.qdocconf
@@ -2,7 +2,7 @@ sources.fileextensions = "*.qml *.cpp *.qdoc"
 headers.fileextensions = "*.h"
 
 # images
-imagedirs = images
+imagedirs = ./src/images
 
 # zero warning policy
 warninglimit = 0
@@ -21,16 +21,14 @@ DocBook.outputsubdir = docbook
 DocBook.its = true
 DocBook.usedocbookextensions = true
 
-includepaths += -I.
+includepaths += -I./src
 
-headers = testcpp.h \
-          dont.h
-sources = testcpp.cpp \
-          classlists.qdoc \
-          dont.cpp \
-          properties.qdoc \
-          unseenclass.qdoc
-exampledirs = snippets
+headerdirs = ./src \
+             ./src/qml
+sourcedirs = ./src \
+             ./src/qml
+exampledirs = ./src/snippets \
+              ./src/qml
 
 macro.CMDFN = \\\\fn
 macro.nothing = \\dontdocument ()
@@ -52,11 +50,6 @@ moduleheader = TestCPP
 project = Test
 description = "A test project for QDoc build artifacts"
 
-exampledirs = qml
-
-headerdirs += .
-sourcedirs += qml
-
 examples.fileextensions = "*.qml *.cpp"
 
 macro.begincomment      = "\\c{/*}"
@@ -75,9 +68,9 @@ version = 6.2.11
 
 examplesinstallpath = test
 
-exampledirs += examples
+exampledirs += ./src/examples
 
-excludedirs += examples/demos/demo/excludes
+excludedirs += ./src/examples/demos/demo/excludes
 
 # Configure .qhp generation
 qhp.projects            = Test
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/TestCPP b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/TestCPP
index 4ed786108..4ed786108 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/TestCPP
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/TestCPP
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/classlists.qdoc b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/classlists.qdoc
index 2954e5beb..2954e5beb 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/classlists.qdoc
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/classlists.qdoc
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/dont.cpp b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/dont.cpp
index 39be5bbbf..39be5bbbf 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/dont.cpp
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/dont.cpp
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/dont.h b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/dont.h
index 0614c713e..0614c713e 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/dont.h
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/dont.h
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/examples/demos/demo/demo.cpp b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/examples/demos/demo/demo.cpp
index 906c6292f..906c6292f 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/examples/demos/demo/demo.cpp
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/examples/demos/demo/demo.cpp
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/examples/demos/demo/demo.pro b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/examples/demos/demo/demo.pro
index dbe8ff3c0..dbe8ff3c0 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/examples/demos/demo/demo.pro
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/examples/demos/demo/demo.pro
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/examples/demos/demo/doc/src/demo.qdoc b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/examples/demos/demo/doc/src/demo.qdoc
index 21ebc5588..21ebc5588 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/examples/demos/demo/doc/src/demo.qdoc
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/examples/demos/demo/doc/src/demo.qdoc
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/examples/demos/demo/dontxclude/CMakeLists.txt b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/examples/demos/demo/dontxclude/CMakeLists.txt
index d29157aad..d29157aad 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/examples/demos/demo/dontxclude/CMakeLists.txt
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/examples/demos/demo/dontxclude/CMakeLists.txt
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/examples/demos/demo/excludes/CMakeLists.txt b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/examples/demos/demo/excludes/CMakeLists.txt
index 09b447642..09b447642 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/examples/demos/demo/excludes/CMakeLists.txt
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/examples/demos/demo/excludes/CMakeLists.txt
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/examples/demos/hidden/doc/src/hidden.qdoc b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/examples/demos/hidden/doc/src/hidden.qdoc
index dddcbc074..dddcbc074 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/examples/demos/hidden/doc/src/hidden.qdoc
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/examples/demos/hidden/doc/src/hidden.qdoc
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/examples/demos/hidden/hidden.pro b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/examples/demos/hidden/hidden.pro
index dbe8ff3c0..dbe8ff3c0 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/examples/demos/hidden/hidden.pro
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/examples/demos/hidden/hidden.pro
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/images/01.png b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/images/01.png
index d73ab969b..d73ab969b 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/images/01.png
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/images/01.png
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/images/leonardo-da-vinci.png b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/images/leonardo-da-vinci.png
index 854acb4ca..854acb4ca 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/images/leonardo-da-vinci.png
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/images/leonardo-da-vinci.png
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/properties.qdoc b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/properties.qdoc
index 95aa3635c..95aa3635c 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/properties.qdoc
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/properties.qdoc
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/DocTest.qml b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/DocTest.qml
index dfae6f13d..dfae6f13d 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/DocTest.qml
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/DocTest.qml
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/cmaketest/CMakeLists.txt b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/cmaketest/CMakeLists.txt
index 89eafa300..89eafa300 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/cmaketest/CMakeLists.txt
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/cmaketest/CMakeLists.txt
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/cmaketest/doc/src/cmaketest.qdoc b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/cmaketest/doc/src/cmaketest.qdoc
index 0e8a2ab3c..0e8a2ab3c 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/cmaketest/doc/src/cmaketest.qdoc
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/cmaketest/doc/src/cmaketest.qdoc
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/cmaketest/main.cpp b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/cmaketest/main.cpp
index 68d71eb71..68d71eb71 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/cmaketest/main.cpp
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/cmaketest/main.cpp
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/componentset/ProgressBar.qml b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/componentset/ProgressBar.qml
index 633a3ff5d..633a3ff5d 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/componentset/ProgressBar.qml
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/componentset/ProgressBar.qml
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/componentset/Switch.qml b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/componentset/Switch.qml
index 123e86468..123e86468 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/componentset/Switch.qml
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/componentset/Switch.qml
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/componentset/TabWidget.qml b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/componentset/TabWidget.qml
index 57808c1a5..57808c1a5 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/componentset/TabWidget.qml
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/componentset/TabWidget.qml
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/componentset/componentset.pro b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/componentset/componentset.pro
index 5b44737c2..5b44737c2 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/componentset/componentset.pro
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/componentset/componentset.pro
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/componentset/componentset.qml b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/componentset/componentset.qml
index 18b25884a..18b25884a 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/componentset/componentset.qml
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/componentset/componentset.qml
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/componentset/examples.qdoc b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/componentset/examples.qdoc
index 1069c55fd..1069c55fd 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/componentset/examples.qdoc
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/componentset/examples.qdoc
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/componentset/uicomponents.qdoc.sample b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/componentset/uicomponents.qdoc.sample
index efbcd9511..efbcd9511 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/componentset/uicomponents.qdoc.sample
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/componentset/uicomponents.qdoc.sample
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/doctest/DocTest.qml b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/doctest/DocTest.qml
index 07201403f..07201403f 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/doctest/DocTest.qml
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/doctest/DocTest.qml
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/modules.qdoc b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/modules.qdoc
index 3b17b5d92..3b17b5d92 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/modules.qdoc
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/modules.qdoc
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/parent.qdoc b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/parent.qdoc
index d6bbb5738..d6bbb5738 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/parent.qdoc
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/parent.qdoc
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/type.cpp b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/type.cpp
index 8bd99a82b..8bd99a82b 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/type.cpp
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/qml/type.cpp
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/snippets/snippet_testcpp.cpp b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/snippets/snippet_testcpp.cpp
index 1660fbc2b..1660fbc2b 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/snippets/snippet_testcpp.cpp
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/snippets/snippet_testcpp.cpp
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/testcpp.cpp b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/testcpp.cpp
index d31167efb..d31167efb 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/testcpp.cpp
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/testcpp.cpp
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/testcpp.h b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/testcpp.h
index 06126494a..06126494a 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/testcpp.h
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/testcpp.h
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/unseenclass.qdoc b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/unseenclass.qdoc
index 8798e3147..8798e3147 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/unseenclass.qdoc
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/src/unseenclass.qdoc
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/cxx20/cxx20.qdocconf b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/cxx20/cxx20.qdocconf
index 5f7f63924..f8943e417 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/cxx20/cxx20.qdocconf
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/cxx20/cxx20.qdocconf
@@ -1,8 +1,8 @@
 project = cxx20
 
-headerdirs  = .
-sourcedirs  = .
-exampledirs = .
+headerdirs  = ./src
+sourcedirs  = ./src
+exampledirs = ./src
 
 macro.equalitycomparesto  = "\\compareswith equality \1\n\\endcompareswith"
 
@@ -21,7 +21,7 @@ sources.fileextensions = "*.qml *.cpp *.qdoc"
 headers.fileextensions = "*.h"
 
 # images
-imagedirs = images
+imagedirs = ./src/images
 
 # zero warning policy
 warninglimit = 0
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/cxx20/classes_with_various_ordering.cpp b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/cxx20/src/classes_with_various_ordering.cpp
index c9029e446..c9029e446 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/cxx20/classes_with_various_ordering.cpp
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/cxx20/src/classes_with_various_ordering.cpp
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/cxx20/classes_with_various_ordering.h b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/cxx20/src/classes_with_various_ordering.h
index 4c9f6970e..4c9f6970e 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/cxx20/classes_with_various_ordering.h
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/cxx20/src/classes_with_various_ordering.h
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/globalfunc/globalfunc.qdocconf b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/globalfunc/globalfunc.qdocconf
index 944f7c6ce..fb28478bf 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/globalfunc/globalfunc.qdocconf
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/globalfunc/globalfunc.qdocconf
@@ -2,7 +2,7 @@ sources.fileextensions = "*.qml *.cpp *.qdoc"
 headers.fileextensions = "*.h"
 
 # images
-imagedirs = images
+imagedirs = ./src/images
 
 # zero warning policy
 warninglimit = 0
@@ -17,7 +17,7 @@ HTML.nosubdirs = true
 HTML.outputsubdir = html
 
 project = TestGlobals
-includepaths += -Iglobalfunc
+includepaths += -I./src/globalfunc
 
-headers = global.h
-sources = global.qdoc
+headers = ./src/global.h
+sources = ./src/global.qdoc
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/globalfunc/TestGlobals b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/globalfunc/src/TestGlobals
index dc4f98a6e..dc4f98a6e 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/globalfunc/TestGlobals
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/globalfunc/src/TestGlobals
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/globalfunc/global.h b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/globalfunc/src/global.h
index 8b5290072..8b5290072 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/globalfunc/global.h
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/globalfunc/src/global.h
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/globalfunc/global.qdoc b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/globalfunc/src/global.qdoc
index f61ed5f58..f61ed5f58 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/globalfunc/global.qdoc
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/globalfunc/src/global.qdoc
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/headerfile/headerfile.qdocconf b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/headerfile/headerfile.qdocconf
index a3e4d2e39..b449319cc 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/headerfile/headerfile.qdocconf
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/headerfile/headerfile.qdocconf
@@ -2,7 +2,7 @@ sources.fileextensions = "*.qml *.cpp *.qdoc"
 headers.fileextensions = "*.h"
 
 # images
-imagedirs = images
+imagedirs = ./src/images
 
 # zero warning policy
 warninglimit = 0
@@ -12,9 +12,9 @@ warninglimit.enabled = true
 locationinfo = false
 
 project = HeaderFile
-moduleheader = testheader.h
+moduleheader = .src/testheader.h
 
-{includepaths,sourcedirs,headerdirs} += .
+{includepaths,sourcedirs,headerdirs} += ./src
 
 outputformats = HTML WebXML DocBook
 HTML.nosubdirs = true
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/headerfile/testheader.cpp b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/headerfile/src/testheader.cpp
index 43c512f36..43c512f36 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/headerfile/testheader.cpp
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/headerfile/src/testheader.cpp
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/headerfile/testheader.h b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/headerfile/src/testheader.h
index 5ea361685..5ea361685 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/headerfile/testheader.h
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/headerfile/src/testheader.h
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/true/another-page-with-comments-in-the-brief.webxml b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/webxml/another-page-with-comments-in-the-brief.webxml
index 7e82dfad6..7e82dfad6 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/true/another-page-with-comments-in-the-brief.webxml
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/webxml/another-page-with-comments-in-the-brief.webxml
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/true/brief-adventures.webxml b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/webxml/brief-adventures.webxml
index 3a6f5f2d5..3a6f5f2d5 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/true/brief-adventures.webxml
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/webxml/brief-adventures.webxml
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/true/illformatted-examples.webxml b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/webxml/illformatted-examples.webxml
index b49d1b297..b49d1b297 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/true/illformatted-examples.webxml
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/webxml/illformatted-examples.webxml
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/true/illformatteddocumentation-someexample-example.webxml b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/webxml/illformatteddocumentation-someexample-example.webxml
index 675e3d74f..675e3d74f 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/true/illformatteddocumentation-someexample-example.webxml
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/webxml/illformatteddocumentation-someexample-example.webxml
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/true/illformatteddocumentation.index b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/webxml/illformatteddocumentation.index
index e9898cd2e..e9898cd2e 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/true/illformatteddocumentation.index
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/webxml/illformatteddocumentation.index
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/true/page-with-an-image-at-the-top.webxml b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/webxml/page-with-an-image-at-the-top.webxml
index da7b4f1d9..da7b4f1d9 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/true/page-with-an-image-at-the-top.webxml
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/webxml/page-with-an-image-at-the-top.webxml
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/true/page-with-comment-after-brief.webxml b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/webxml/page-with-comment-after-brief.webxml
index f5b28e302..f5b28e302 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/true/page-with-comment-after-brief.webxml
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/webxml/page-with-comment-after-brief.webxml
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/true/page-with-comment-in-brief.webxml b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/webxml/page-with-comment-in-brief.webxml
index 575cd111d..575cd111d 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/true/page-with-comment-in-brief.webxml
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/expected/webxml/page-with-comment-in-brief.webxml
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/illformatted_documentation.qdocconf b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/illformatted_documentation.qdocconf
index 01c7f7d54..716882f41 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/illformatted_documentation.qdocconf
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/illformatted_documentation.qdocconf
@@ -1,13 +1,13 @@
 project = IllformattedDocumentation
 
-headerdirs  = .
-sourcedirs  = .
-exampledirs = .
+headerdirs  = ./src
+sourcedirs  = ./src
+exampledirs = ./src
 
 outputformats             = WebXML HTML
 WebXML.quotinginformation = true
 WebXML.nosubdirs          = true
-WebXML.outputsubdir       = true
+WebXML.outputsubdir       = webxml
 
 warninglimit = 3 # The broken example generates three warnings
 
@@ -15,7 +15,7 @@ sources.fileextensions = "*.qml *.cpp *.qdoc"
 headers.fileextensions = "*.h"
 
 # images
-imagedirs = ../images
+imagedirs = ./src/images
 
 warninglimit.enabled = true
 
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/brief_adventures.qdoc b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/src/brief_adventures.qdoc
index 9bad0106b..9bad0106b 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/brief_adventures.qdoc
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/src/brief_adventures.qdoc
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/illformatted-examples.qdoc b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/src/illformatted-examples.qdoc
index 5bfa9e7f6..5bfa9e7f6 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/illformatted-examples.qdoc
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/src/illformatted-examples.qdoc
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/some_example.qdoc b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/src/some_example.qdoc
index a64605b87..a64605b87 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/some_example.qdoc
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/illformatted_documentation/src/some_example.qdoc
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/line_comments/line_comments.qdocconf b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/line_comments/line_comments.qdocconf
index 22f42f4ef..db5b91b55 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/line_comments/line_comments.qdocconf
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/line_comments/line_comments.qdocconf
@@ -1,6 +1,6 @@
 project = LineComment
 
-{headerdirs,sourcedirs,exampledirs} = .
+{headerdirs,sourcedirs,exampledirs} = ./src
 
 outputformats             = WebXML HTML DocBook
 WebXML.quotinginformation = true
@@ -24,4 +24,4 @@ warninglimit.enabled = true
 # don't write host system-specific paths to index files
 locationinfo = false
 
-imagedirs = images
+imagedirs = ./src/images
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/line_comments/images/leonardo-da-vinci.png b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/line_comments/src/images/leonardo-da-vinci.png
index 854acb4ca..854acb4ca 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/line_comments/images/leonardo-da-vinci.png
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/line_comments/src/images/leonardo-da-vinci.png
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/line_comments/line_comment_adventures.qdoc b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/line_comments/src/line_comment_adventures.qdoc
index 28dfe5c90..28dfe5c90 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/line_comments/line_comment_adventures.qdoc
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/line_comments/src/line_comment_adventures.qdoc
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/minimal_configuration/minimal_configuration.qdocconf b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/minimal_configuration/minimal_configuration.qdocconf
index 40e62c0a1..6fc9c025e 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/minimal_configuration/minimal_configuration.qdocconf
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/minimal_configuration/minimal_configuration.qdocconf
@@ -5,8 +5,8 @@ locationinfo = false
 headers.fileextensions  = "*.h *.hpp"
 sources.fileextensions  = "*.cpp *.qml *.qdoc"
 
-headerdirs  = .
-sourcedirs  = .
+headerdirs  = ./src
+sourcedirs  = ./src
 
 warninglimit = 0
 warninglimit.enabled = true
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/minimal_configuration/README.qdoc b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/minimal_configuration/src/README.qdoc
index 879370377..879370377 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/minimal_configuration/README.qdoc
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/minimal_configuration/src/README.qdoc
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/modulestate/modulestate.qdocconf b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/modulestate/modulestate.qdocconf
index 110cb5d35..1f75c8036 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/modulestate/modulestate.qdocconf
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/modulestate/modulestate.qdocconf
@@ -1,8 +1,8 @@
 project = ModuleState
 
-headerdirs  = .
-sourcedirs  = .
-exampledirs = .
+headerdirs  = ./src
+sourcedirs  = ./src
+exampledirs = ./src
 
 outputformats             = WebXML HTML DocBook
 WebXML.quotinginformation = true
@@ -19,7 +19,7 @@ sources.fileextensions = "*.qml *.cpp *.qdoc"
 headers.fileextensions = "*.h"
 
 # images
-imagedirs = images
+imagedirs = ./src/images
 
 # zero warning policy
 warninglimit = 0
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/modulestate/classes_in_stateful_module.h b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/modulestate/src/classes_in_stateful_module.h
index 21578e91b..21578e91b 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/modulestate/classes_in_stateful_module.h
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/modulestate/src/classes_in_stateful_module.h
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/modulestate/module_in_a_state.qdoc b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/modulestate/src/module_in_a_state.qdoc
index 3bdb12503..3bdb12503 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/modulestate/module_in_a_state.qdoc
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/modulestate/src/module_in_a_state.qdoc
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/non_ascii_character_input/non_ascii_character_input.qdocconf b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/non_ascii_character_input/non_ascii_character_input.qdocconf
index 9f399a01d..0177b51ac 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/non_ascii_character_input/non_ascii_character_input.qdocconf
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/non_ascii_character_input/non_ascii_character_input.qdocconf
@@ -3,9 +3,9 @@
 
 project = NonAsciiCharacterInput
 
-headerdirs  = .
-sourcedirs  = .
-exampledirs = .
+headerdirs  = ./src
+sourcedirs  = ./src
+exampledirs = ./src
 
 outputformats             = WebXML HTML
 WebXML.quotinginformation = true
@@ -15,7 +15,7 @@ sources.fileextensions = "*.qml *.cpp *.qdoc"
 headers.fileextensions = "*.h"
 
 # images
-imagedirs = ../images
+imagedirs = ./src/images
 
 # zero warning policy
 warninglimit = 0
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/non_ascii_character_input/adventures_with_non_ascii_characters.qdoc b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/non_ascii_character_input/src/adventures_with_non_ascii_characters.qdoc
index c5f09cb1c..c5f09cb1c 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/non_ascii_character_input/adventures_with_non_ascii_characters.qdoc
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/non_ascii_character_input/src/adventures_with_non_ascii_characters.qdoc
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/outputfromqdocfiles.qdocconf b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/outputfromqdocfiles.qdocconf
index da99d9a4d..8a053de44 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/outputfromqdocfiles.qdocconf
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/outputfromqdocfiles.qdocconf
@@ -7,7 +7,7 @@ sources.fileextensions = "*.qml *.cpp *.qdoc"
 headers.fileextensions = "*.h"
 
 # images
-imagedirs = images
+imagedirs = ./src/images
 
 # zero warning policy -- here; allow one which is (qdoc) warning: Can't link to ''
 warninglimit = 1
@@ -26,10 +26,10 @@ DocBook.nosubdirs         = true
 DocBook.outputsubdir      = docbook
 DocBook.usedocbookextensions = true
 
-sources = qdoctests-outputfromqdocfiles.qdoc \
-          qdoctests-outputfromqdocmanuallikefiles.qdoc
+sources = ./src/qdoctests-outputfromqdocfiles.qdoc \
+          ./src/qdoctests-outputfromqdocmanuallikefiles.qdoc
 
-exampledirs = snippets
+exampledirs = ./src/snippets
 
 macro.beginqdoc = "\\c {/*!}"
 macro.endqdoc = "\\c */"
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/images/01.png b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/src/images/01.png
index d73ab969b..d73ab969b 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/images/01.png
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/src/images/01.png
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/images/leonardo-da-vinci.png b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/src/images/leonardo-da-vinci.png
index 854acb4ca..854acb4ca 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/images/leonardo-da-vinci.png
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/src/images/leonardo-da-vinci.png
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/qdoctests-outputfromqdocfiles.qdoc b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/src/qdoctests-outputfromqdocfiles.qdoc
index b19905b7e..b19905b7e 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/qdoctests-outputfromqdocfiles.qdoc
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/src/qdoctests-outputfromqdocfiles.qdoc
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/qdoctests-outputfromqdocmanuallikefiles.qdoc b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/src/qdoctests-outputfromqdocmanuallikefiles.qdoc
index 23f229745..23f229745 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/qdoctests-outputfromqdocmanuallikefiles.qdoc
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/src/qdoctests-outputfromqdocmanuallikefiles.qdoc
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/snippets/main.cpp b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/src/snippets/main.cpp
index 1c886ace4..1c886ace4 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/snippets/main.cpp
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/outputfromqdocfiles/src/snippets/main.cpp
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/proxypage/proxypage.qdocconf b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/proxypage/proxypage.qdocconf
index 505b7d617..2f686a44c 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/proxypage/proxypage.qdocconf
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/proxypage/proxypage.qdocconf
@@ -2,7 +2,7 @@ sources.fileextensions = "*.qml *.cpp *.qdoc"
 headers.fileextensions = "*.h"
 
 # images
-imagedirs = images
+imagedirs = ./src/images
 
 # zero warning policy
 warninglimit = 0
@@ -12,10 +12,10 @@ warninglimit.enabled = true
 locationinfo = false
 
 project = ProxyPage
-includepaths += .
-moduleheader = proxy.h
+includepaths += ./src
+{sourcedirs,headerdirs} = ./src
 
-{sourcedirs,headerdirs} = .
+moduleheader = proxy.h
 
 outputformats                       = HTML DocBook
 {HTML.nosubdirs,DocBook.nosubdirs}  = true
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/proxypage/proxy.h b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/proxypage/src/proxy.h
index 5d4835fc9..5d4835fc9 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/proxypage/proxy.h
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/proxypage/src/proxy.h
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/proxypage/proxy.qdoc b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/proxypage/src/proxy.qdoc
index 43bf8a013..43bf8a013 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/proxypage/proxy.qdoc
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/proxypage/src/proxy.qdoc
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/qmlenumvaluesfromcpp/qmlenumvaluesfromcpp.qdocconf b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/qmlenumvaluesfromcpp/qmlenumvaluesfromcpp.qdocconf
index 56b0a3ecc..218005310 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/qmlenumvaluesfromcpp/qmlenumvaluesfromcpp.qdocconf
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/qmlenumvaluesfromcpp/qmlenumvaluesfromcpp.qdocconf
@@ -1,8 +1,8 @@
 project = QmlEnumValuesFromCpp
 moduleheader = class.h
-includepaths = .
+includepaths = ./src
 
-{sourcedirs,headerdirs} = .
+{sourcedirs,headerdirs} = ./src
 
 # zero warning policy
 warninglimit = 0
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/qmlenumvaluesfromcpp/class.cpp b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/qmlenumvaluesfromcpp/src/class.cpp
index fa3cc1e31..fa3cc1e31 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/qmlenumvaluesfromcpp/class.cpp
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/qmlenumvaluesfromcpp/src/class.cpp
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/qmlenumvaluesfromcpp/class.h b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/qmlenumvaluesfromcpp/src/class.h
index 8c4967a69..8c4967a69 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/qmlenumvaluesfromcpp/class.h
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/qmlenumvaluesfromcpp/src/class.h
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/qmlenumvaluesfromcpp/qmltype.qdoc b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/qmlenumvaluesfromcpp/src/qmltype.qdoc
index 3cd739c29..3cd739c29 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/qmlenumvaluesfromcpp/qmltype.qdoc
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/qmlenumvaluesfromcpp/src/qmltype.qdoc
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/scopedenum.qdocconf b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/scopedenum.qdocconf
index 3263a3a01..f20a92472 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/scopedenum.qdocconf
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/scopedenum.qdocconf
@@ -2,7 +2,7 @@ sources.fileextensions = "*.qml *.cpp *.qdoc"
 headers.fileextensions = "*.h"
 
 # images
-imagedirs = images
+imagedirs = ./src/images
 
 # zero warning policy
 warninglimit = 0
@@ -12,12 +12,12 @@ warninglimit.enabled = true
 locationinfo = false
 
 project = TestCPP
-includepaths += -I.
+includepaths += -I./src
 
-headers = testcpp.h
-sources = testcpp.cpp \
-          classlists.qdoc \
-          scopedenum.qdoc
+headerdirs = ./src
+sources = ./src/testcpp.cpp \
+          ./src/classlists.qdoc \
+          ./src/scopedenum.qdoc
 exampledirs = snippets
 
 macro.CMDFN = \\\\fn
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/classlists.qdoc b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/src/classlists.qdoc
index 2954e5beb..2954e5beb 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/classlists.qdoc
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/src/classlists.qdoc
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/scopedenum.qdoc b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/src/scopedenum.qdoc
index 22ef9e3f3..22ef9e3f3 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/scopedenum.qdoc
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/src/scopedenum.qdoc
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/snippets/snippet_testcpp.cpp b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/src/snippets/snippet_testcpp.cpp
index 1660fbc2b..1660fbc2b 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/snippets/snippet_testcpp.cpp
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/src/snippets/snippet_testcpp.cpp
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/testcpp.cpp b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/src/testcpp.cpp
index d31167efb..d31167efb 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/testcpp.cpp
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/src/testcpp.cpp
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/testcpp.h b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/src/testcpp.h
index 06126494a..06126494a 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/testcpp.h
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/src/testcpp.h
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tableaftervalue/table-after-value.cpp b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tableaftervalue/src/table-after-value.cpp
index 4ad9932d5..4ad9932d5 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tableaftervalue/table-after-value.cpp
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tableaftervalue/src/table-after-value.cpp
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tableaftervalue/table-after-value.h b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tableaftervalue/src/table-after-value.h
index 466242775..466242775 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tableaftervalue/table-after-value.h
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tableaftervalue/src/table-after-value.h
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tableaftervalue/tableaftervalue.qdocconf b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tableaftervalue/tableaftervalue.qdocconf
index 2e66d749c..fb8daa132 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tableaftervalue/tableaftervalue.qdocconf
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tableaftervalue/tableaftervalue.qdocconf
@@ -1,8 +1,8 @@
 project = TableAfterValue
 
-headerdirs  = .
-sourcedirs  = .
-exampledirs = .
+headerdirs  = ./src
+sourcedirs  = ./src
+exampledirs = ./src
 
 outputformats             = WebXML HTML DocBook
 WebXML.quotinginformation = true
@@ -19,7 +19,7 @@ sources.fileextensions = "*.qml *.cpp *.qdoc"
 headers.fileextensions = "*.h"
 
 # images
-imagedirs = images
+imagedirs = ./src/images
 
 # zero warning policy
 warninglimit = 0
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/templatedcallables/templated_callables.cpp b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/templatedcallables/src/templated_callables.cpp
index 9e91242e3..9e91242e3 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/templatedcallables/templated_callables.cpp
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/templatedcallables/src/templated_callables.cpp
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/templatedcallables/templated_callables.h b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/templatedcallables/src/templated_callables.h
index 827a25da5..827a25da5 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/templatedcallables/templated_callables.h
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/templatedcallables/src/templated_callables.h
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/templatedcallables/templatedcallables.qdocconf b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/templatedcallables/templatedcallables.qdocconf
index ba324fd99..d7a7c46ef 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/templatedcallables/templatedcallables.qdocconf
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/templatedcallables/templatedcallables.qdocconf
@@ -1,8 +1,8 @@
 project = templatedcallables
 
-headerdirs  = .
-sourcedirs  = .
-exampledirs = .
+headerdirs  = ./src
+sourcedirs  = ./src
+exampledirs = ./src
 outputformats = WebXML HTML DocBook
 
 WebXML.quotinginformation = true
@@ -19,7 +19,7 @@ sources.fileextensions = "*.qml *.cpp *.qdoc"
 headers.fileextensions = "*.h"
 
 # images
-imagedirs = images
+imagedirs = ./src/images
 
 # zero warning policy
 warninglimit = 0
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/classlists.qdoc b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/src/classlists.qdoc
index 2954e5beb..2954e5beb 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/classlists.qdoc
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/src/classlists.qdoc
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/snippets/snippet_testcpp.cpp b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/src/snippets/snippet_testcpp.cpp
index 1660fbc2b..1660fbc2b 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/snippets/snippet_testcpp.cpp
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/src/snippets/snippet_testcpp.cpp
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/testcpp.cpp b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/src/testcpp.cpp
index d31167efb..d31167efb 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/testcpp.cpp
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/src/testcpp.cpp
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/testcpp.h b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/src/testcpp.h
index 06126494a..06126494a 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/testcpp.h
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/src/testcpp.h
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/testtemplate.cpp b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/src/testtemplate.cpp
index 04be329ea..04be329ea 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/testtemplate.cpp
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/src/testtemplate.cpp
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/testtemplate.h b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/src/testtemplate.h
index 68c164e25..68c164e25 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/testtemplate.h
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/src/testtemplate.h
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/testtemplate.qdocconf b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/testtemplate.qdocconf
index eca1f9c3c..188c268bd 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/testtemplate.qdocconf
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/testtemplate.qdocconf
@@ -2,7 +2,7 @@ sources.fileextensions = "*.qml *.cpp *.qdoc"
 headers.fileextensions = "*.h"
 
 # images
-imagedirs = images
+imagedirs = ./src/images
 
 # zero warning policy
 warninglimit = 0
@@ -12,14 +12,14 @@ warninglimit.enabled = true
 locationinfo = false
 
 project = TestTemplate
-includepaths += -I.
-
-headers = testcpp.h \
-          testtemplate.h
-sources = testcpp.cpp \
-          testtemplate.cpp \
-          classlists.qdoc
-exampledirs = ../testcpp/snippets
+includepaths += -I./src
+
+headers = ./src/testcpp.h \
+          ./src/testtemplate.h
+sources = ./src/testcpp.cpp \
+          ./src/testtemplate.cpp \
+          ./src/classlists.qdoc
+exampledirs = ./src/snippets
 
 macro.CMDFN = \\\\fn
 macro.nothing = \\dontdocument ()
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/images/01.png b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/src/images/01.png
index d73ab969b..d73ab969b 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/images/01.png
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/src/images/01.png
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/images/leonardo-da-vinci.png b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/src/images/leonardo-da-vinci.png
index 854acb4ca..854acb4ca 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/images/leonardo-da-vinci.png
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/src/images/leonardo-da-vinci.png
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/qdoctests-outputfromqdocfiles.qdoc b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/src/qdoctests-outputfromqdocfiles.qdoc
index b19905b7e..b19905b7e 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/qdoctests-outputfromqdocfiles.qdoc
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/src/qdoctests-outputfromqdocfiles.qdoc
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/qdoctests-outputfromqdocmanuallikefiles.qdoc b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/src/qdoctests-outputfromqdocmanuallikefiles.qdoc
index 23f229745..23f229745 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/qdoctests-outputfromqdocmanuallikefiles.qdoc
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/src/qdoctests-outputfromqdocmanuallikefiles.qdoc
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/snippets/main.cpp b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/src/snippets/main.cpp
index 6993849e4..6993849e4 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/snippets/main.cpp
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/src/snippets/main.cpp
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/toc.qdoc b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/src/toc.qdoc
index 6ca61de64..6ca61de64 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/toc.qdoc
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/src/toc.qdoc
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/tocnavigation.qdocconf b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/tocnavigation.qdocconf
index ef1bde6ea..b78d91169 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/tocnavigation.qdocconf
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/tocnavigation.qdocconf
@@ -24,13 +24,13 @@ DocBook.outputsubdir      = docbook
 DocBook.usedocbookextensions = true
 
 # images
-imagedirs = images
+imagedirs = ./src/images
 
-sources = qdoctests-outputfromqdocfiles.qdoc \
-          qdoctests-outputfromqdocmanuallikefiles.qdoc \
-          toc.qdoc
+sources = ./src/qdoctests-outputfromqdocfiles.qdoc \
+          ./src/qdoctests-outputfromqdocmanuallikefiles.qdoc \
+          ./src/toc.qdoc
 
-exampledirs = snippets
+exampledirs = ./src/snippets
 
 macro.beginqdoc = "\\c {/*!}"
 macro.endqdoc = "\\c */"
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/trailing_backslashes/trailing_backslashes.cpp b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/trailing_backslashes/src/trailing_backslashes.cpp
index 878425613..878425613 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/trailing_backslashes/trailing_backslashes.cpp
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/trailing_backslashes/src/trailing_backslashes.cpp
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/trailing_backslashes/trailing_backslashes.h b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/trailing_backslashes/src/trailing_backslashes.h
index 0fb059b97..0fb059b97 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/trailing_backslashes/trailing_backslashes.h
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/trailing_backslashes/src/trailing_backslashes.h
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/trailing_backslashes/trailing_backslashes.qdocconf b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/trailing_backslashes/trailing_backslashes.qdocconf
index ecbc1da41..3f8f4d011 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/trailing_backslashes/trailing_backslashes.qdocconf
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/trailing_backslashes/trailing_backslashes.qdocconf
@@ -1,8 +1,8 @@
 project = TrailingBackslashes
 
-headerdirs  = .
-sourcedirs  = .
-exampledirs = .
+headerdirs  = ./src/
+sourcedirs  = ./src/
+exampledirs = ./src/
 
 outputformats             = WebXML HTML DocBook
 WebXML.quotinginformation = true
@@ -19,7 +19,7 @@ sources.fileextensions = "*.qml *.cpp *.qdoc"
 headers.fileextensions = "*.h"
 
 # images
-imagedirs = images
+imagedirs = ./src/images
 
 warninglimit.enabled = true
 
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/usingdirective/UsingDirective b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/usingdirective/src/UsingDirective
index 422d01e91..422d01e91 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/usingdirective/UsingDirective
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/usingdirective/src/UsingDirective
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/usingdirective/alias.h b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/usingdirective/src/alias.h
index 5691035da..5691035da 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/usingdirective/alias.h
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/usingdirective/src/alias.h
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/usingdirective/space.cpp b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/usingdirective/src/space.cpp
index d84156da0..d84156da0 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/usingdirective/space.cpp
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/usingdirective/src/space.cpp
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/usingdirective/space.h b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/usingdirective/src/space.h
index 09472535c..09472535c 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/usingdirective/space.h
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/usingdirective/src/space.h
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/usingdirective/usingdirective.qdocconf b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/usingdirective/usingdirective.qdocconf
index 51a6a4fd8..01456b049 100644
--- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/usingdirective/usingdirective.qdocconf
+++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/usingdirective/usingdirective.qdocconf
@@ -2,7 +2,7 @@ sources.fileextensions = "*.qml *.cpp *.qdoc"
 headers.fileextensions = "*.h"
 
 # images
-imagedirs = images
+imagedirs = ./src/images
 
 # zero warning policy
 warninglimit = 0
@@ -24,4 +24,4 @@ WebXML.nosubdirs = true
 WebXML.outputsubdir = webxml
 
 project = UsingDirective
-{includepaths,headerdirs,sourcedirs} = .
+{includepaths,headerdirs,sourcedirs} = ./src/