QDoc: Reorganize expected output testv5.15.0-beta1

As the test has grown in size and scope, the lack of structure adds an
unnecessary mental overhead when adding new tests, or when attempting to
refactor the tests themselves.

- Place all testdata in a directory aptly named testdata, following Qt
  convention.
- Create sub-directories for all tests, so that their data is separated
  from each other.
- Update qdocconf-files to match the new structure.
- Update expected output data to match changes in qdocconf-files.
- Ensure all tests still run; this requires modifications to paths in
  .qdocconf files mostly, but also in #include directives.

Fixes: QTBUG-82159
Change-Id: I43b2333cacc75d1076a8aca86e89ccc52e4ec8a3
Reviewed-by: Levon Sargsyan <levon.sargsyan@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>

64 files changed, 47 insertions, 47 deletions

diff --git a/tests/auto/qdoc/generatedoutput/bug80259/webxml_testmodule.qdocconf b/tests/auto/qdoc/generatedoutput/bug80259/webxml_testmodule.qdocconf
deleted file mode 100644
index 642fe5c2d..000000000
--- a/tests/auto/qdoc/generatedoutput/bug80259/webxml_testmodule.qdocconf
+++ /dev/null
@@ -1,2 +0,0 @@
-include(testmodule.qdocconf)
-include(../webxml.qdocconf)
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput-linking.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput-linking.xml
index 75255b85d..90fbb79cc 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput-linking.xml
+++ b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput-linking.xml
@@ -2,7 +2,7 @@
 <db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en">
 <db:info>
 <db:title>Testing QDoc's link command</db:title>
-<db:productname>Test</db:productname>
+<db:productname>OutputFromQDocFiles</db:productname>
 <db:titleabbrev>A test project for QDoc build artifacts</db:titleabbrev>
 <db:abstract>
 <db:para>This is a page for testing QDoc's link command.</db:para>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput.xml
index 017cb8a0b..610197cc7 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput.xml
+++ b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput.xml
@@ -2,7 +2,7 @@
 <db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en">
 <db:info>
 <db:title>Testing QDoc output from .qdoc files</db:title>
-<db:productname>Test</db:productname>
+<db:productname>OutputFromQDocFiles</db:productname>
 <db:titleabbrev>A test project for QDoc build artifacts</db:titleabbrev>
 <db:abstract>
 <db:para>This is a simple page for testing purposes only.</db:para>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput-linking.webxml b/tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput-linking.webxml
index eb519cd51..3983c2bbd 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput-linking.webxml
+++ b/tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput-linking.webxml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <WebXML>
     <document>
-        <page name="qdoctests-qdocfileoutput-linking.html" href="qdoctests-qdocfileoutput-linking.html" status="active" location="qdoctests-outputfromqdocfiles.qdoc" documented="true" subtype="page" title="Testing QDoc's link command" fulltitle="Testing QDoc's link command" subtitle="" module="Test" brief="This is a page for testing QDoc's link command">
+        <page name="qdoctests-qdocfileoutput-linking.html" href="qdoctests-qdocfileoutput-linking.html" status="active" location="qdoctests-outputfromqdocfiles.qdoc" documented="true" subtype="page" title="Testing QDoc's link command" fulltitle="Testing QDoc's link command" subtitle="" module="OutputFromQDocFiles" brief="This is a page for testing QDoc's link command">
             <target name="link-test-target"/>
             <keyword name="qdoc-linking-test" title="QDoc Linking Test"/>
             <contents name="link-targets" title="Link targets" level="1"/>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput.webxml b/tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput.webxml
index 94dee89e3..4a56533a4 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput.webxml
+++ b/tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput.webxml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <WebXML>
     <document>
-        <page name="qdoctests-qdocfileoutput.html" href="qdoctests-qdocfileoutput.html" status="active" location="qdoctests-outputfromqdocfiles.qdoc" documented="true" subtype="page" title="Testing QDoc output from .qdoc files" fulltitle="Testing QDoc output from .qdoc files" subtitle="" module="Test" brief="This is a simple page for testing purposes only">
+        <page name="qdoctests-qdocfileoutput.html" href="qdoctests-qdocfileoutput.html" status="active" location="qdoctests-outputfromqdocfiles.qdoc" documented="true" subtype="page" title="Testing QDoc output from .qdoc files" fulltitle="Testing QDoc output from .qdoc files" subtitle="" module="OutputFromQDocFiles" brief="This is a simple page for testing purposes only">
             <contents name="supported-file-types" title="Supported file types" level="1"/>
             <contents name="further-information" title="Further information" level="1"/>
             <contents name="linking" title="Linking" level="1"/>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html
index 74b47375e..2e294ffff 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
 <!-- qdoctests-outputfromqdocfiles.qdoc -->
-  <title>Testing QDoc's link command | Test</title>
+  <title>Testing QDoc's link command | OutputFromQDocFiles</title>
 </head>
 <body>
 <div class="sidebar">
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html
index c4975e349..8b60812bb 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
 <!-- qdoctests-outputfromqdocfiles.qdoc -->
-  <title>Testing QDoc output from .qdoc files | Test</title>
+  <title>Testing QDoc output from .qdoc files | OutputFromQDocFiles</title>
 </head>
 <body>
 <div class="sidebar">
diff --git a/tests/auto/qdoc/generatedoutput/testcpp.qdocconf b/tests/auto/qdoc/generatedoutput/testcpp.qdocconf
deleted file mode 100644
index 70c226cf2..000000000
--- a/tests/auto/qdoc/generatedoutput/testcpp.qdocconf
+++ /dev/null
@@ -1,7 +0,0 @@
-project = TestCPP
-includepaths += -I.
-
-headers = testcpp.h
-sources = testcpp.cpp
-
-macro.CMDFN = \\\\fn
diff --git a/tests/auto/qdoc/generatedoutput/bug80259/inc/testmodule/TestModule.h b/tests/auto/qdoc/generatedoutput/testdata/bug80259/inc/testmodule/TestModule.h
index 686cbe948..686cbe948 100644
--- a/tests/auto/qdoc/generatedoutput/bug80259/inc/testmodule/TestModule.h
+++ b/tests/auto/qdoc/generatedoutput/testdata/bug80259/inc/testmodule/TestModule.h
diff --git a/tests/auto/qdoc/generatedoutput/bug80259/inc/testmodule/aaa.h b/tests/auto/qdoc/generatedoutput/testdata/bug80259/inc/testmodule/aaa.h
index dea5c1841..dea5c1841 100644
--- a/tests/auto/qdoc/generatedoutput/bug80259/inc/testmodule/aaa.h
+++ b/tests/auto/qdoc/generatedoutput/testdata/bug80259/inc/testmodule/aaa.h
diff --git a/tests/auto/qdoc/generatedoutput/bug80259/inc/testmodule/bbb.h b/tests/auto/qdoc/generatedoutput/testdata/bug80259/inc/testmodule/bbb.h
index 0dc6e52c6..0dc6e52c6 100644
--- a/tests/auto/qdoc/generatedoutput/bug80259/inc/testmodule/bbb.h
+++ b/tests/auto/qdoc/generatedoutput/testdata/bug80259/inc/testmodule/bbb.h
diff --git a/tests/auto/qdoc/generatedoutput/bug80259/inc/testmodule/ccc.h b/tests/auto/qdoc/generatedoutput/testdata/bug80259/inc/testmodule/ccc.h
index d3a1557e1..d3a1557e1 100644
--- a/tests/auto/qdoc/generatedoutput/bug80259/inc/testmodule/ccc.h
+++ b/tests/auto/qdoc/generatedoutput/testdata/bug80259/inc/testmodule/ccc.h
diff --git a/tests/auto/qdoc/generatedoutput/bug80259/src/main.cpp b/tests/auto/qdoc/generatedoutput/testdata/bug80259/src/main.cpp
index a8991e18f..a8991e18f 100644
--- a/tests/auto/qdoc/generatedoutput/bug80259/src/main.cpp
+++ b/tests/auto/qdoc/generatedoutput/testdata/bug80259/src/main.cpp
diff --git a/tests/auto/qdoc/generatedoutput/bug80259/src/qdoc/index.qdoc b/tests/auto/qdoc/generatedoutput/testdata/bug80259/src/qdoc/index.qdoc
index 35ef7e087..35ef7e087 100644
--- a/tests/auto/qdoc/generatedoutput/bug80259/src/qdoc/index.qdoc
+++ b/tests/auto/qdoc/generatedoutput/testdata/bug80259/src/qdoc/index.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/bug80259/testmodule.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/bug80259/testmodule.qdocconf
index c02fb6fcf..c02fb6fcf 100644
--- a/tests/auto/qdoc/generatedoutput/bug80259/testmodule.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/bug80259/testmodule.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/testdata/bug80259/webxml_testmodule.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/bug80259/webxml_testmodule.qdocconf
new file mode 100644
index 000000000..dc9234fbb
--- /dev/null
+++ b/tests/auto/qdoc/generatedoutput/testdata/bug80259/webxml_testmodule.qdocconf
@@ -0,0 +1,2 @@
+include(testmodule.qdocconf)
+include(../configs/webxml.qdocconf)
diff --git a/tests/auto/qdoc/generatedoutput/docbook.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/docbook.qdocconf
index 6fe708176..6fe708176 100644
--- a/tests/auto/qdoc/generatedoutput/docbook.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/docbook.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/docbook_test.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/docbook_test.qdocconf
index e8095e405..e8095e405 100644
--- a/tests/auto/qdoc/generatedoutput/docbook_test.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/docbook_test.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/docbook_testcpp.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/docbook_testcpp.qdocconf
index 0abdf8169..0abdf8169 100644
--- a/tests/auto/qdoc/generatedoutput/docbook_testcpp.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/docbook_testcpp.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/docbook_testqml.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/docbook_testqml.qdocconf
index 0a0a18b07..0a0a18b07 100644
--- a/tests/auto/qdoc/generatedoutput/docbook_testqml.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/docbook_testqml.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/examples-qhp.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/examples-qhp.qdocconf
index b4598476e..b4598476e 100644
--- a/tests/auto/qdoc/generatedoutput/examples-qhp.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/examples-qhp.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/ignoresince.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/ignoresince.qdocconf
index 0aa0dbc45..0aa0dbc45 100644
--- a/tests/auto/qdoc/generatedoutput/ignoresince.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/ignoresince.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/scopedenum.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/scopedenum.qdocconf
index f967e266d..adeaab554 100644
--- a/tests/auto/qdoc/generatedoutput/scopedenum.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/scopedenum.qdocconf
@@ -1,7 +1,7 @@
 include(testcpp.qdocconf)
 defines += test_scopedenum
 
-sources += scopedenum.qdoc
+sources += ../scopedenum/scopedenum.qdoc
 
 HTML.nosubdirs    = true
 HTML.outputsubdir = scopedenum
diff --git a/tests/auto/qdoc/generatedoutput/test.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/test.qdocconf
index fe51e1c67..f6473ccf7 100644
--- a/tests/auto/qdoc/generatedoutput/test.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/test.qdocconf
@@ -1,8 +1,8 @@
-project = Test
+project = OutputFromQDocFiles
 description = "A test project for QDoc build artifacts"
 moduleheader =
 
-sources = qdoctests-outputfromqdocfiles.qdoc
+sources = ../outputfromqdocfiles/qdoctests-outputfromqdocfiles.qdoc
 
 macro.beginqdoc = "\\c {/*!}"
 macro.endqdoc = "\\c */"
diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/testcpp.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/testcpp.qdocconf
new file mode 100644
index 000000000..53f6071f9
--- /dev/null
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/testcpp.qdocconf
@@ -0,0 +1,7 @@
+project = TestCPP
+includepaths += -I.
+
+headers = ../testcpp/testcpp.h
+sources = ../testcpp/testcpp.cpp
+
+macro.CMDFN = \\\\fn
diff --git a/tests/auto/qdoc/generatedoutput/testqml.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/testqml.qdocconf
index f618fe1b8..2eb2c5036 100644
--- a/tests/auto/qdoc/generatedoutput/testqml.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/testqml.qdocconf
@@ -5,13 +5,13 @@ project = Test
 description = "A test project for QDoc build artifacts"
 outputdir = ./html
 
-exampledirs = qml
+exampledirs = ../qml
 
-headerdirs += .
-sourcedirs += qml
+headerdirs += ../
+sourcedirs += ../qml
 
 # Exclude source files from other tests' subdirs
-excludedirs = ./bug80259
+excludedirs = ../bug80259
 
 sources.fileextensions = "*.qml *.cpp *.qdoc"
 headers.fileextensions = "*.h"
diff --git a/tests/auto/qdoc/generatedoutput/testtemplate.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/testtemplate.qdocconf
index 437319683..c53e43177 100644
--- a/tests/auto/qdoc/generatedoutput/testtemplate.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/testtemplate.qdocconf
@@ -1,8 +1,8 @@
 include(testcpp.qdocconf)
 defines += test_template
 
-headers += testtemplate.h
-sources += testtemplate.cpp
+headers += ../testtemplate/testtemplate.h
+sources += ../testtemplate/testtemplate.cpp
 
 HTML.nosubdirs          = true
 HTML.outputsubdir       = template
diff --git a/tests/auto/qdoc/generatedoutput/webxml.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/webxml.qdocconf
index 903c7fcfe..903c7fcfe 100644
--- a/tests/auto/qdoc/generatedoutput/webxml.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/webxml.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/webxml_test.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/webxml_test.qdocconf
index bac4f3b4e..bac4f3b4e 100644
--- a/tests/auto/qdoc/generatedoutput/webxml_test.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/webxml_test.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/webxml_testcpp.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/webxml_testcpp.qdocconf
index e242cef27..e242cef27 100644
--- a/tests/auto/qdoc/generatedoutput/webxml_testcpp.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/webxml_testcpp.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/webxml_testqml.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/webxml_testqml.qdocconf
index 537685700..537685700 100644
--- a/tests/auto/qdoc/generatedoutput/webxml_testqml.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/configs/webxml_testqml.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/crossmodule/CrossModule b/tests/auto/qdoc/generatedoutput/testdata/crossmodule/CrossModule
index df9c82ad5..df9c82ad5 100644
--- a/tests/auto/qdoc/generatedoutput/crossmodule/CrossModule
+++ b/tests/auto/qdoc/generatedoutput/testdata/crossmodule/CrossModule
diff --git a/tests/auto/qdoc/generatedoutput/crossmodule/crossmodule.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/crossmodule/crossmodule.qdocconf
index fb4a6be77..fb4a6be77 100644
--- a/tests/auto/qdoc/generatedoutput/crossmodule/crossmodule.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/crossmodule/crossmodule.qdocconf
diff --git a/tests/auto/qdoc/generatedoutput/crossmodule/testtype.cpp b/tests/auto/qdoc/generatedoutput/testdata/crossmodule/testtype.cpp
index 50d5d4845..50d5d4845 100644
--- a/tests/auto/qdoc/generatedoutput/crossmodule/testtype.cpp
+++ b/tests/auto/qdoc/generatedoutput/testdata/crossmodule/testtype.cpp
diff --git a/tests/auto/qdoc/generatedoutput/crossmodule/testtype.h b/tests/auto/qdoc/generatedoutput/testdata/crossmodule/testtype.h
index 957505fcc..4ffb0c80b 100644
--- a/tests/auto/qdoc/generatedoutput/crossmodule/testtype.h
+++ b/tests/auto/qdoc/generatedoutput/testdata/crossmodule/testtype.h
@@ -27,7 +27,7 @@
 ****************************************************************************/
 #pragma once
 
-#include "../testcpp.h"
+#include "../testcpp/testcpp.h"
 
 class TestType : public TestQDoc::TestDerived
 {
diff --git a/tests/auto/qdoc/generatedoutput/dontdocument/TestCPP b/tests/auto/qdoc/generatedoutput/testdata/dontdocument/TestCPP
index 7291e6d8f..7291e6d8f 100644
--- a/tests/auto/qdoc/generatedoutput/dontdocument/TestCPP
+++ b/tests/auto/qdoc/generatedoutput/testdata/dontdocument/TestCPP
diff --git a/tests/auto/qdoc/generatedoutput/dontdocument/dont.cpp b/tests/auto/qdoc/generatedoutput/testdata/dontdocument/dont.cpp
index 33e208459..33e208459 100644
--- a/tests/auto/qdoc/generatedoutput/dontdocument/dont.cpp
+++ b/tests/auto/qdoc/generatedoutput/testdata/dontdocument/dont.cpp
diff --git a/tests/auto/qdoc/generatedoutput/dontdocument/dont.h b/tests/auto/qdoc/generatedoutput/testdata/dontdocument/dont.h
index 5ef436b5c..5ef436b5c 100644
--- a/tests/auto/qdoc/generatedoutput/dontdocument/dont.h
+++ b/tests/auto/qdoc/generatedoutput/testdata/dontdocument/dont.h
diff --git a/tests/auto/qdoc/generatedoutput/dontdocument/dontdocument.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/dontdocument/dontdocument.qdocconf
index 1c141784b..117920e56 100644
--- a/tests/auto/qdoc/generatedoutput/dontdocument/dontdocument.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/dontdocument/dontdocument.qdocconf
@@ -1,4 +1,4 @@
-include(../testcpp.qdocconf)
+include(../configs/testcpp.qdocconf)
 
 headers += dont.h
 sources += dont.cpp test.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/dontdocument/test.qdoc b/tests/auto/qdoc/generatedoutput/testdata/dontdocument/test.qdoc
index 3f6e0be30..3f6e0be30 100644
--- a/tests/auto/qdoc/generatedoutput/dontdocument/test.qdoc
+++ b/tests/auto/qdoc/generatedoutput/testdata/dontdocument/test.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/includefromexampledirs/excludes/anotherindex.qdoc b/tests/auto/qdoc/generatedoutput/testdata/includefromexampledirs/excludes/anotherindex.qdoc
index 75dd9197d..75dd9197d 100644
--- a/tests/auto/qdoc/generatedoutput/includefromexampledirs/excludes/anotherindex.qdoc
+++ b/tests/auto/qdoc/generatedoutput/testdata/includefromexampledirs/excludes/anotherindex.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/includefromexampledirs/excludes/parentinclude.qdoc b/tests/auto/qdoc/generatedoutput/testdata/includefromexampledirs/excludes/parentinclude.qdoc
index c95e22125..c95e22125 100644
--- a/tests/auto/qdoc/generatedoutput/includefromexampledirs/excludes/parentinclude.qdoc
+++ b/tests/auto/qdoc/generatedoutput/testdata/includefromexampledirs/excludes/parentinclude.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/includefromexampledirs/includefromexampledirs.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/includefromexampledirs/includefromexampledirs.qdocconf
index 05683c80b..9c60c758f 100644
--- a/tests/auto/qdoc/generatedoutput/includefromexampledirs/includefromexampledirs.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/includefromexampledirs/includefromexampledirs.qdocconf
@@ -1,4 +1,4 @@
-include(../testqml.qdocconf)
+include(../configs/testqml.qdocconf)
 
 includepaths += ..
 sourcedirs += src
diff --git a/tests/auto/qdoc/generatedoutput/includefromexampledirs/src/includefromparent.qdoc b/tests/auto/qdoc/generatedoutput/testdata/includefromexampledirs/src/includefromparent.qdoc
index 7b4c00b76..7b4c00b76 100644
--- a/tests/auto/qdoc/generatedoutput/includefromexampledirs/src/includefromparent.qdoc
+++ b/tests/auto/qdoc/generatedoutput/testdata/includefromexampledirs/src/includefromparent.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/includefromexampledirs/src/parent.qdocinc b/tests/auto/qdoc/generatedoutput/testdata/includefromexampledirs/src/parent.qdocinc
index 307c39dbd..307c39dbd 100644
--- a/tests/auto/qdoc/generatedoutput/includefromexampledirs/src/parent.qdocinc
+++ b/tests/auto/qdoc/generatedoutput/testdata/includefromexampledirs/src/parent.qdocinc
diff --git a/tests/auto/qdoc/generatedoutput/qdoctests-outputfromqdocfiles.qdoc b/tests/auto/qdoc/generatedoutput/testdata/outputfromqdocfiles/qdoctests-outputfromqdocfiles.qdoc
index e56c447c4..e56c447c4 100644
--- a/tests/auto/qdoc/generatedoutput/qdoctests-outputfromqdocfiles.qdoc
+++ b/tests/auto/qdoc/generatedoutput/testdata/outputfromqdocfiles/qdoctests-outputfromqdocfiles.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/qml/DocTest.qml b/tests/auto/qdoc/generatedoutput/testdata/qml/DocTest.qml
index 1ddafcfe4..1ddafcfe4 100644
--- a/tests/auto/qdoc/generatedoutput/qml/DocTest.qml
+++ b/tests/auto/qdoc/generatedoutput/testdata/qml/DocTest.qml
diff --git a/tests/auto/qdoc/generatedoutput/qml/componentset/ProgressBar.qml b/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/ProgressBar.qml
index 2a40cc488..2a40cc488 100644
--- a/tests/auto/qdoc/generatedoutput/qml/componentset/ProgressBar.qml
+++ b/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/ProgressBar.qml
diff --git a/tests/auto/qdoc/generatedoutput/qml/componentset/Switch.qml b/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/Switch.qml
index db9616b69..db9616b69 100644
--- a/tests/auto/qdoc/generatedoutput/qml/componentset/Switch.qml
+++ b/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/Switch.qml
diff --git a/tests/auto/qdoc/generatedoutput/qml/componentset/TabWidget.qml b/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/TabWidget.qml
index 07fd40db9..07fd40db9 100644
--- a/tests/auto/qdoc/generatedoutput/qml/componentset/TabWidget.qml
+++ b/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/TabWidget.qml
diff --git a/tests/auto/qdoc/generatedoutput/qml/componentset/componentset.pro b/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/componentset.pro
index 5b44737c2..5b44737c2 100644
--- a/tests/auto/qdoc/generatedoutput/qml/componentset/componentset.pro
+++ b/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/componentset.pro
diff --git a/tests/auto/qdoc/generatedoutput/qml/componentset/examples.qdoc b/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/examples.qdoc
index 2f56c221c..2f56c221c 100644
--- a/tests/auto/qdoc/generatedoutput/qml/componentset/examples.qdoc
+++ b/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/examples.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/qml/componentset/uicomponents.qdoc.sample b/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/uicomponents.qdoc.sample
index 0c6d187ed..0c6d187ed 100644
--- a/tests/auto/qdoc/generatedoutput/qml/componentset/uicomponents.qdoc.sample
+++ b/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/uicomponents.qdoc.sample
diff --git a/tests/auto/qdoc/generatedoutput/qml/parent.qdoc b/tests/auto/qdoc/generatedoutput/testdata/qml/parent.qdoc
index fed18491c..fed18491c 100644
--- a/tests/auto/qdoc/generatedoutput/qml/parent.qdoc
+++ b/tests/auto/qdoc/generatedoutput/testdata/qml/parent.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/qml/type.cpp b/tests/auto/qdoc/generatedoutput/testdata/qml/type.cpp
index bf04bdb43..bf04bdb43 100644
--- a/tests/auto/qdoc/generatedoutput/qml/type.cpp
+++ b/tests/auto/qdoc/generatedoutput/testdata/qml/type.cpp
diff --git a/tests/auto/qdoc/generatedoutput/qmlpropertygroups/parent.qdoc b/tests/auto/qdoc/generatedoutput/testdata/qmlpropertygroups/parent.qdoc
index c7002e96b..c7002e96b 100644
--- a/tests/auto/qdoc/generatedoutput/qmlpropertygroups/parent.qdoc
+++ b/tests/auto/qdoc/generatedoutput/testdata/qmlpropertygroups/parent.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/qmlpropertygroups/qmlpropertygroups.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/qmlpropertygroups/qmlpropertygroups.qdocconf
index 6ed830c82..c535b4032 100644
--- a/tests/auto/qdoc/generatedoutput/qmlpropertygroups/qmlpropertygroups.qdocconf
+++ b/tests/auto/qdoc/generatedoutput/testdata/qmlpropertygroups/qmlpropertygroups.qdocconf
@@ -1,4 +1,4 @@
-include(../testqml.qdocconf)
+include(../configs/testqml.qdocconf)
 
 includepaths += ..
 sourcedirs += .
diff --git a/tests/auto/qdoc/generatedoutput/scopedenum.qdoc b/tests/auto/qdoc/generatedoutput/testdata/scopedenum/scopedenum.qdoc
index 4262c1ce6..4262c1ce6 100644
--- a/tests/auto/qdoc/generatedoutput/scopedenum.qdoc
+++ b/tests/auto/qdoc/generatedoutput/testdata/scopedenum/scopedenum.qdoc
diff --git a/tests/auto/qdoc/generatedoutput/TestCPP b/tests/auto/qdoc/generatedoutput/testdata/testcpp/TestCPP
index 4ed786108..4ed786108 100644
--- a/tests/auto/qdoc/generatedoutput/TestCPP
+++ b/tests/auto/qdoc/generatedoutput/testdata/testcpp/TestCPP
diff --git a/tests/auto/qdoc/generatedoutput/testcpp.cpp b/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp
index 5d3055ac2..5d3055ac2 100644
--- a/tests/auto/qdoc/generatedoutput/testcpp.cpp
+++ b/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp
diff --git a/tests/auto/qdoc/generatedoutput/testcpp.h b/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.h
index 4ae33a404..4ae33a404 100644
--- a/tests/auto/qdoc/generatedoutput/testcpp.h
+++ b/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.h
diff --git a/tests/auto/qdoc/generatedoutput/testtemplate.cpp b/tests/auto/qdoc/generatedoutput/testdata/testtemplate/testtemplate.cpp
index e9755769f..e9755769f 100644
--- a/tests/auto/qdoc/generatedoutput/testtemplate.cpp
+++ b/tests/auto/qdoc/generatedoutput/testdata/testtemplate/testtemplate.cpp
diff --git a/tests/auto/qdoc/generatedoutput/testtemplate.h b/tests/auto/qdoc/generatedoutput/testdata/testtemplate/testtemplate.h
index d60ab0da4..d60ab0da4 100644
--- a/tests/auto/qdoc/generatedoutput/testtemplate.h
+++ b/tests/auto/qdoc/generatedoutput/testdata/testtemplate/testtemplate.h
diff --git a/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp b/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp
index 4cab6a8fd..3c47627b3 100644
--- a/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp
+++ b/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp
@@ -182,14 +182,14 @@ void tst_generatedOutput::copyIndexFiles()
 
 void tst_generatedOutput::htmlFromQDocFile()
 {
-    testAndCompare("test.qdocconf",
+    testAndCompare("testdata/configs/test.qdocconf",
                    "qdoctests-qdocfileoutput.html "
                    "qdoctests-qdocfileoutput-linking.html");
 }
 
 void tst_generatedOutput::htmlFromCpp()
 {
-    testAndCompare("testcpp.qdocconf",
+    testAndCompare("testdata/configs/testcpp.qdocconf",
                    "testcpp-module.html "
                    "testqdoc-test.html "
                    "testqdoc-test-members.html "
@@ -198,7 +198,7 @@ void tst_generatedOutput::htmlFromCpp()
 
 void tst_generatedOutput::htmlFromQml()
 {
-    testAndCompare("testqml.qdocconf",
+    testAndCompare("testdata/configs/testqml.qdocconf",
                    "test-componentset-example.html "
                    "uicomponents-qmlmodule.html "
                    "qdoc-test-qmlmodule.html "
@@ -215,7 +215,7 @@ void tst_generatedOutput::htmlFromQml()
 
 void tst_generatedOutput::htmlFromCppBug80259()
 {
-    testAndCompare("bug80259/testmodule.qdocconf",
+    testAndCompare("testdata/bug80259/testmodule.qdocconf",
                    "first.html "
                    "second.html "
                    "third.html "
@@ -224,14 +224,14 @@ void tst_generatedOutput::htmlFromCppBug80259()
 
 void tst_generatedOutput::webXmlFromQDocFile()
 {
-    testAndCompare("webxml_test.qdocconf",
+    testAndCompare("testdata/configs/webxml_test.qdocconf",
                    "html/qdoctests-qdocfileoutput.webxml "
                    "html/qdoctests-qdocfileoutput-linking.webxml");
 }
 
 void tst_generatedOutput::webXmlFromCpp()
 {
-    testAndCompare("webxml_testcpp.qdocconf",
+    testAndCompare("testdata/configs/webxml_testcpp.qdocconf",
                    "html/testcpp-module.webxml "
                    "html/testqdoc-test.webxml "
                    "html/testqdoc-testderived.webxml");
@@ -239,14 +239,14 @@ void tst_generatedOutput::webXmlFromCpp()
 
 void tst_generatedOutput::webXmlFromQml()
 {
-    testAndCompare("webxml_testqml.qdocconf",
+    testAndCompare("testdata/configs/webxml_testqml.qdocconf",
                    "html/test-componentset-example.webxml "
                    "html/uicomponents-qmlmodule.webxml");
 }
 
 void tst_generatedOutput::webXmlFromCppBug80259()
 {
-    testAndCompare("bug80259/webxml_testmodule.qdocconf",
+    testAndCompare("testdata/bug80259/webxml_testmodule.qdocconf",
                    "html/first.webxml "
                    "html/second.webxml "
                    "html/third.webxml "
@@ -255,14 +255,14 @@ void tst_generatedOutput::webXmlFromCppBug80259()
 
 void tst_generatedOutput::docBookFromQDocFile()
 {
-    testAndCompare("docbook_test.qdocconf",
+    testAndCompare("testdata/configs/docbook_test.qdocconf",
                    "docbook/qdoctests-qdocfileoutput.xml "
                    "docbook/qdoctests-qdocfileoutput-linking.xml");
 }
 
 void tst_generatedOutput::docBookFromCpp()
 {
-    testAndCompare("docbook_testcpp.qdocconf",
+    testAndCompare("testdata/configs/docbook_testcpp.qdocconf",
                    "docbook/testcpp-module.xml "
                    "docbook/testqdoc-test.xml "
                    "docbook/testqdoc-testderived.xml "
@@ -271,7 +271,7 @@ void tst_generatedOutput::docBookFromCpp()
 
 void tst_generatedOutput::docBookFromQml()
 {
-    testAndCompare("docbook_testqml.qdocconf",
+    testAndCompare("testdata/configs/docbook_testqml.qdocconf",
                    "docbook/test-componentset-example.xml "
                    "docbook/uicomponents-qmlmodule.xml "
                    "docbook/qdoc-test-qmlmodule.xml "
@@ -287,19 +287,19 @@ void tst_generatedOutput::docBookFromQml()
 
 void tst_generatedOutput::examplesManifestXml()
 {
-    testAndCompare("examples-qhp.qdocconf", "examples-manifest.xml");
+    testAndCompare("testdata/configs/examples-qhp.qdocconf", "examples-manifest.xml");
 }
 
 void tst_generatedOutput::ignoresinceVariable()
 {
-    testAndCompare("ignoresince.qdocconf",
+    testAndCompare("testdata/configs/ignoresince.qdocconf",
                    "ignoresince/testqdoc.html "
                    "ignoresince/testqdoc-test.html");
 }
 
 void tst_generatedOutput::templateParameters()
 {
-    testAndCompare("testtemplate.qdocconf",
+    testAndCompare("testdata/configs/testtemplate.qdocconf",
                    "template/testqdoc-test.html "
                    "template/foo.html "
                    "template/bar.html "
@@ -308,19 +308,19 @@ void tst_generatedOutput::templateParameters()
 
 void tst_generatedOutput::scopedEnum()
 {
-    testAndCompare("scopedenum.qdocconf", "scopedenum/testqdoc-test.html");
+    testAndCompare("testdata/configs/scopedenum.qdocconf", "scopedenum/testqdoc-test.html");
 }
 
 void tst_generatedOutput::dontDocument()
 {
-    testAndCompare("dontdocument/dontdocument.qdocconf",
+    testAndCompare("testdata/dontdocument/dontdocument.qdocconf",
                    "dontdocument/classes.html "
                    "dontdocument/seenclass.html");
 }
 
 void tst_generatedOutput::inheritedQmlPropertyGroups()
 {
-    testAndCompare("qmlpropertygroups/qmlpropertygroups.qdocconf",
+    testAndCompare("testdata/qmlpropertygroups/qmlpropertygroups.qdocconf",
                    "qmlpropertygroups/qml-qdoc-test-anotherchild-members.html");
 }
 
@@ -329,7 +329,7 @@ void tst_generatedOutput::crossModuleLinking()
     htmlFromCpp();
     copyIndexFiles();
     QString indexDir = QLatin1String("-indexdir ") +  m_outputDir->path();
-    testAndCompare("crossmodule/crossmodule.qdocconf",
+    testAndCompare("testdata/crossmodule/crossmodule.qdocconf",
                    "crossmodule/testtype.html "
                    "crossmodule/testtype-members.html",
                    indexDir.toLatin1().data());
@@ -337,7 +337,7 @@ void tst_generatedOutput::crossModuleLinking()
 
 void tst_generatedOutput::includeFromExampleDirs()
 {
-    testAndCompare("includefromexampledirs/includefromexampledirs.qdocconf",
+    testAndCompare("testdata/includefromexampledirs/includefromexampledirs.qdocconf",
                    "includefromexampledirs/index.html "
                    "includefromexampledirs/qml-qdoc-test-abstractparent.html "
                    "includefromexampledirs/qml-qdoc-test-abstractparent-members.html");