Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: Iabcee67b9cf246cd5f1fe97205ed41b4763210ec

77 files changed, 177 insertions, 100 deletions

diff --git a/src/designer/src/components/propertyeditor/previewwidget.ui b/src/designer/src/components/propertyeditor/previewwidget.ui
index 64c29229f..077ff24b4 100644
--- a/src/designer/src/components/propertyeditor/previewwidget.ui
+++ b/src/designer/src/components/propertyeditor/previewwidget.ui
@@ -129,7 +129,7 @@
         <item>
          <widget class="QPushButton" name="toggleButton">
           <property name="text">
-           <string>ToggleButton</string>
+           <string extracomment="Palette Editor Preview Widget">ToggleButton</string>
           </property>
           <property name="checkable">
            <bool>true</bool>
@@ -147,14 +147,14 @@
           <item>
            <widget class="QToolButton" name="toolButton">
             <property name="text">
-             <string>ToolButton</string>
+             <string extracomment="Palette Editor Preview Widget">ToolButton</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QToolButton" name="menuToolButton">
             <property name="text">
-             <string>Menu</string>
+             <string extracomment="Palette Editor Preview Widget">Menu</string>
             </property>
            </widget>
           </item>
@@ -181,7 +181,7 @@
    <item row="0" column="1">
     <widget class="QGroupBox" name="itemGroupBox">
      <property name="title">
-      <string>Item Views</string>
+      <string extracomment="Palette Editor Preview Widget">Item Views</string>
      </property>
      <property name="checkable">
       <bool>true</bool>
@@ -194,26 +194,26 @@
         </property>
         <column>
          <property name="text">
-          <string>Column 1</string>
+          <string extracomment="Palette Editor Preview Widget">Column 1</string>
          </property>
         </column>
         <item>
          <property name="text">
-          <string>Top Level 1</string>
+          <string extracomment="Palette Editor Preview Widget">Top Level 1</string>
          </property>
          <item>
           <property name="text">
-           <string>Nested Item 1</string>
+           <string extracomment="Palette Editor Preview Widget">Nested Item 1</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>Nested Item 2</string>
+           <string extracomment="Palette Editor Preview Widget">Nested Item 2</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>Nested Item 3</string>
+           <string extracomment="Palette Editor Preview Widget">Nested Item 3</string>
           </property>
          </item>
         </item>
@@ -225,7 +225,7 @@
    <item row="1" column="0">
     <widget class="QGroupBox" name="simpleGroupBox">
      <property name="title">
-      <string>Simple Input Widgets</string>
+      <string extracomment="Palette Editor Preview Widget">Simple Input Widgets</string>
      </property>
      <property name="checkable">
       <bool>true</bool>
@@ -252,12 +252,12 @@
           </item>
           <item>
            <property name="text">
-            <string>Item1</string>
+            <string extracomment="Palette Editor Preview Widget">Item1</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>Item2</string>
+            <string extracomment="Palette Editor Preview Widget">Item2</string>
            </property>
           </item>
          </widget>
@@ -291,7 +291,7 @@
    <item row="1" column="1">
     <widget class="QGroupBox" name="displayGroupBox">
      <property name="title">
-      <string>Display Widgets</string>
+      <string extracomment="Palette Editor Preview Widget">Display Widgets</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_4">
       <item>
@@ -307,7 +307,7 @@
       <item>
        <widget class="QLabel" name="label">
         <property name="text">
-         <string>QLabel</string>
+         <string extracomment="Palette Editor Preview Widget">QLabel</string>
         </property>
        </widget>
       </item>
@@ -317,7 +317,7 @@
          <enum>QFrame::StyledPanel</enum>
         </property>
         <property name="text">
-         <string>QLabel with frame</string>
+         <string extracomment="Palette Editor Preview Widget">QLabel with frame</string>
         </property>
        </widget>
       </item>
diff --git a/src/qdoc/clangcodeparser.cpp b/src/qdoc/clangcodeparser.cpp
index 366e2671e..6a4a77d7c 100644
--- a/src/qdoc/clangcodeparser.cpp
+++ b/src/qdoc/clangcodeparser.cpp
@@ -593,6 +593,8 @@ CXChildVisitResult ClangVisitor::visitFnSignature(CXCursor cursor, CXSourceLocat
                                                   bool &ignoreSignature)
 {
     switch (clang_getCursorKind(cursor)) {
+    case CXCursor_Namespace:
+        return CXChildVisit_Recurse;
     case CXCursor_FunctionDecl:
     case CXCursor_FunctionTemplate:
     case CXCursor_CXXMethod:
@@ -1503,14 +1505,14 @@ void ClangCodeParser::parseSourceFile(const Location & /*location*/, const QStri
         return;
     }
 
-    CXCursor cur = clang_getTranslationUnitCursor(tu);
+    CXCursor tuCur = clang_getTranslationUnitCursor(tu);
     ClangVisitor visitor(qdb_, allHeaders_);
-    visitor.visitChildren(cur);
+    visitor.visitChildren(tuCur);
 
     CXToken *tokens;
     unsigned int numTokens = 0;
     const QSet<QString> &commands = topicCommands() + metaCommands();
-    clang_tokenize(tu, clang_getCursorExtent(cur), &tokens, &numTokens);
+    clang_tokenize(tu, clang_getCursorExtent(tuCur), &tokens, &numTokens);
 
     for (unsigned int i = 0; i < numTokens; ++i) {
         if (clang_getTokenKind(tokens[i]) != CXToken_Comment)
@@ -1519,7 +1521,8 @@ void ClangCodeParser::parseSourceFile(const Location & /*location*/, const QStri
         if (!comment.startsWith("/*!"))
             continue;
 
-        auto loc = fromCXSourceLocation(clang_getTokenLocation(tu, tokens[i]));
+        auto commentLoc = clang_getTokenLocation(tu, tokens[i]);
+        auto loc = fromCXSourceLocation(commentLoc);
         auto end_loc = fromCXSourceLocation(clang_getRangeEnd(clang_getTokenExtent(tu, tokens[i])));
         Doc::trimCStyleComment(loc, comment);
 
@@ -1536,7 +1539,6 @@ void ClangCodeParser::parseSourceFile(const Location & /*location*/, const QStri
             topic = topics[0].topic;
 
         if (topic.isEmpty()) {
-            CXSourceLocation commentLoc = clang_getTokenLocation(tu, tokens[i]);
             Node *n = nullptr;
             if (i + 1 < numTokens) {
                 // Try to find the next declaration.
@@ -1568,6 +1570,17 @@ void ClangCodeParser::parseSourceFile(const Location & /*location*/, const QStri
                 }
             }
         } else {
+            // Store the namespace scope from lexical parents of the comment
+            namespaceScope_.clear();
+            CXCursor cur = clang_getCursor(tu, commentLoc);
+            while (true) {
+                CXCursorKind kind = clang_getCursorKind(cur);
+                if (clang_isTranslationUnit(kind) || clang_isInvalid(kind))
+                    break;
+                if (kind == CXCursor_Namespace)
+                    namespaceScope_ << fromCXString(clang_getCursorSpelling(cur));
+                cur = clang_getCursorLexicalParent(cur);
+            }
             processTopicArgs(doc, topic, nodes, docs);
         }
         processMetaCommands(nodes, docs);
@@ -1654,9 +1667,14 @@ Node *ClangCodeParser::parseFnArg(const Location &location, const QString &fnArg
         args.push_back(pchName_.constData());
     }
     CXTranslationUnit tu;
-    QByteArray fn = fnArg.toUtf8();
+    QByteArray fn;
+    for (const auto &ns : qAsConst(namespaceScope_))
+        fn.prepend("namespace " + ns.toUtf8() + " {");
+    fn += fnArg.toUtf8();
     if (!fn.endsWith(";"))
         fn += "{ }";
+    fn.append(namespaceScope_.size(), '}');
+
     const char *dummyFileName = "/fn_dummyfile.cpp";
     CXUnsavedFile unsavedFile { dummyFileName, fn.constData(),
                                 static_cast<unsigned long>(fn.size()) };
diff --git a/src/qdoc/clangcodeparser.h b/src/qdoc/clangcodeparser.h
index 078d307c2..9af292e67 100644
--- a/src/qdoc/clangcodeparser.h
+++ b/src/qdoc/clangcodeparser.h
@@ -78,6 +78,7 @@ private:
     QVector<QByteArray> defines_;
     std::vector<const char *> args_;
     QVector<QByteArray> moreArgs_;
+    QStringList namespaceScope_;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qdoc/codeparser.cpp b/src/qdoc/codeparser.cpp
index e9dc3a352..db2d0df97 100644
--- a/src/qdoc/codeparser.cpp
+++ b/src/qdoc/codeparser.cpp
@@ -161,11 +161,11 @@ const QSet<QString> &CodeParser::commonMetaCommands()
                             << COMMAND_INJSMODULE << COMMAND_INMODULE << COMMAND_INPUBLICGROUP
                             << COMMAND_INQMLMODULE << COMMAND_INTERNAL << COMMAND_MAINCLASS
                             << COMMAND_NOAUTOLIST << COMMAND_NONREENTRANT << COMMAND_OBSOLETE
-                            << COMMAND_PAGEKEYWORDS << COMMAND_PRELIMINARY << COMMAND_QMLABSTRACT
-                            << COMMAND_QMLDEFAULT << COMMAND_QMLINHERITS << COMMAND_QMLREADONLY
-                            << COMMAND_QTVARIABLE << COMMAND_REENTRANT << COMMAND_SINCE
-                            << COMMAND_STARTPAGE << COMMAND_SUBTITLE << COMMAND_THREADSAFE
-                            << COMMAND_TITLE << COMMAND_WRAPPER;
+                            << COMMAND_PRELIMINARY << COMMAND_QMLABSTRACT << COMMAND_QMLDEFAULT
+                            << COMMAND_QMLINHERITS << COMMAND_QMLREADONLY << COMMAND_QTVARIABLE
+                            << COMMAND_REENTRANT << COMMAND_SINCE << COMMAND_STARTPAGE
+                            << COMMAND_SUBTITLE << COMMAND_THREADSAFE << COMMAND_TITLE
+                            << COMMAND_WRAPPER;
     }
     return commonMetaCommands_;
 }
@@ -269,7 +269,7 @@ bool CodeParser::isParsingQdoc() const
 void CodeParser::checkModuleInclusion(Node *n)
 {
     if (n->physicalModuleName().isEmpty()) {
-        n->setPhysicalModuleName(Generator::defaultModuleName());
+        qdb_->addToModule(Generator::defaultModuleName(), n);
         QString word;
         switch (n->nodeType()) {
         case Node::Class:
diff --git a/src/qdoc/codeparser.h b/src/qdoc/codeparser.h
index 6ab214eb1..7ae34df1d 100644
--- a/src/qdoc/codeparser.h
+++ b/src/qdoc/codeparser.h
@@ -137,7 +137,6 @@ private:
 #define COMMAND_OBSOLETE Doc::alias(QLatin1String("obsolete"))
 #define COMMAND_OVERLOAD Doc::alias(QLatin1String("overload"))
 #define COMMAND_PAGE Doc::alias(QLatin1String("page"))
-#define COMMAND_PAGEKEYWORDS Doc::alias(QLatin1String("pagekeywords"))
 #define COMMAND_PERMISSIONS Doc::alias(QLatin1String("permissions"))
 #define COMMAND_PRELIMINARY Doc::alias(QLatin1String("preliminary"))
 #define COMMAND_PREVIOUSPAGE Doc::alias(QLatin1String("previouspage"))
diff --git a/src/qdoc/cppcodeparser.cpp b/src/qdoc/cppcodeparser.cpp
index 877b08279..dec081c22 100644
--- a/src/qdoc/cppcodeparser.cpp
+++ b/src/qdoc/cppcodeparser.cpp
@@ -620,8 +620,6 @@ void CppCodeParser::processMetaCommand(const Doc &doc, const QString &command,
         node->setSince(arg);
     } else if (command == COMMAND_WRAPPER) {
         node->setWrapper();
-    } else if (command == COMMAND_PAGEKEYWORDS) {
-        node->addPageKeywords(arg);
     } else if (command == COMMAND_THREADSAFE) {
         node->setThreadSafeness(Node::ThreadSafe);
     } else if (command == COMMAND_TITLE) {
diff --git a/src/qdoc/docbookgenerator.h b/src/qdoc/docbookgenerator.h
index ad5b36220..9a223f4af 100644
--- a/src/qdoc/docbookgenerator.h
+++ b/src/qdoc/docbookgenerator.h
@@ -172,7 +172,7 @@ private:
     QString buildversion;
     QXmlStreamWriter *writer = nullptr;
 
-    Config *config;
+    Config *config = nullptr;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qdoc/node.cpp b/src/qdoc/node.cpp
index cffaf79dd..634cce3ec 100644
--- a/src/qdoc/node.cpp
+++ b/src/qdoc/node.cpp
@@ -1822,12 +1822,6 @@ QString Node::physicalModuleName() const
   Returns the node's reconstituted brief data member.
  */
 
-/*! \fn void Node::addPageKeywords(const QString &t)
-  If this is a PageNode, the function appends the string \a t
-  to the page keywords data member. Otherwise the function does
-  nothing.
- */
-
 /*! \fn bool Node::isSharingComment() const
   This function returns \c true if the node is sharing a comment
   with other nodes. For example, multiple functions can be documented
@@ -3661,14 +3655,6 @@ bool PageNode::setTitle(const QString &title)
   Appends \a t to the list of group names.
  */
 
-/*! \fn const QStringList &PageNode::pageKeywords() const
-  Returns a const reference to the list of keywords for this page.
- */
-
-/*! \fn void PageNode::addPageKeywords(const QString &t)
-  Appends \a t to the keywords list.
- */
-
 /*! \fn void PageNode::setOutputFileName(const QString &f)
   Sets this PageNode's output file name to \a f.
  */
diff --git a/src/qdoc/node.h b/src/qdoc/node.h
index f1b356fa4..9f78cc824 100644
--- a/src/qdoc/node.h
+++ b/src/qdoc/node.h
@@ -322,7 +322,6 @@ public:
     const QString &templateDecl() const { return templateDecl_; }
     const QString &reconstitutedBrief() const { return reconstitutedBrief_; }
     QString nodeSubtypeString() const;
-    virtual void addPageKeywords(const QString &) {}
 
     bool isSharingComment() const { return (sharedCommentNode_ != nullptr); }
     bool hasSharedDoc() const;
@@ -434,8 +433,6 @@ public:
     const QStringList &groupNames() const { return groupNames_; }
     void appendGroupName(const QString &t) override { groupNames_.append(t); }
 
-    const QStringList &pageKeywords() const { return pageKeywds_; }
-    void addPageKeywords(const QString &t) override { pageKeywds_ << t; }
     void setOutputFileName(const QString &f) override { outputFileName_ = f; }
     QString outputFileName() const override { return outputFileName_; }
 
@@ -448,7 +445,6 @@ protected:
     QString subtitle_;
     QString outputFileName_;
     QStringList groupNames_;
-    QStringList pageKeywds_;
 };
 
 class ExternalPageNode : public PageNode
diff --git a/src/qdoc/qmlvisitor.cpp b/src/qdoc/qmlvisitor.cpp
index 168c5e38d..2ee362d77 100644
--- a/src/qdoc/qmlvisitor.cpp
+++ b/src/qdoc/qmlvisitor.cpp
@@ -453,8 +453,6 @@ void QmlDocVisitor::applyMetacommands(QQmlJS::AST::SourceLocation, Node *node, D
                 node->setStatus(Node::Internal);
             } else if (command == COMMAND_OBSOLETE) {
                 node->setStatus(Node::Obsolete);
-            } else if (command == COMMAND_PAGEKEYWORDS) {
-                // Not done yet. Do we need this?
             } else if (command == COMMAND_PRELIMINARY) {
                 node->setStatus(Node::Preliminary);
             } else if (command == COMMAND_SINCE) {
diff --git a/src/qtdiag/qtdiag.cpp b/src/qtdiag/qtdiag.cpp
index 94b166cad..4fc288cd7 100644
--- a/src/qtdiag/qtdiag.cpp
+++ b/src/qtdiag/qtdiag.cpp
@@ -302,6 +302,48 @@ void dumpRhiBackendInfo(QTextStream &str, const char *name, QRhi::Implementation
         { "ReadBackNonBaseMipLevel", QRhi::ReadBackNonBaseMipLevel },
         { nullptr, QRhi::Feature(0) }
     };
+    struct RhiTextureFormat {
+        const char *name;
+        QRhiTexture::Format val;
+    };
+    const RhiTextureFormat textureFormats[] = {
+        { "RGBA8", QRhiTexture::RGBA8 },
+        { "BGRA8", QRhiTexture::BGRA8 },
+        { "R8", QRhiTexture::R8 },
+        { "R16", QRhiTexture::R16 },
+        { "RED_OR_ALPHA8", QRhiTexture::RED_OR_ALPHA8 },
+        { "RGBA16F", QRhiTexture::RGBA16F },
+        { "RGBA32F", QRhiTexture::RGBA32F },
+        { "R16F", QRhiTexture::R16F },
+        { "R32F", QRhiTexture::R32F },
+        { "D16", QRhiTexture::D16 },
+        { "D32F", QRhiTexture::D32F },
+        { "BC1", QRhiTexture::BC1 },
+        { "BC2", QRhiTexture::BC2 },
+        { "BC3", QRhiTexture::BC3 },
+        { "BC4", QRhiTexture::BC4 },
+        { "BC5", QRhiTexture::BC5 },
+        { "BC6H", QRhiTexture::BC6H },
+        { "BC7", QRhiTexture::BC7 },
+        { "ETC2_RGB8", QRhiTexture::ETC2_RGB8 },
+        { "ETC2_RGB8A1", QRhiTexture::ETC2_RGB8A1 },
+        { "ETC2_RGBA8", QRhiTexture::ETC2_RGBA8 },
+        { "ASTC_4x4", QRhiTexture::ASTC_4x4 },
+        { "ASTC_5x4", QRhiTexture::ASTC_5x4 },
+        { "ASTC_5x5", QRhiTexture::ASTC_5x5 },
+        { "ASTC_6x5", QRhiTexture::ASTC_6x5 },
+        { "ASTC_6x6", QRhiTexture::ASTC_6x6 },
+        { "ASTC_8x5", QRhiTexture::ASTC_8x5 },
+        { "ASTC_8x6", QRhiTexture::ASTC_8x6 },
+        { "ASTC_8x8", QRhiTexture::ASTC_8x8 },
+        { "ASTC_10x5", QRhiTexture::ASTC_10x5 },
+        { "ASTC_10x6", QRhiTexture::ASTC_10x6 },
+        { "ASTC_10x8", QRhiTexture::ASTC_10x8 },
+        { "ASTC_10x10", QRhiTexture::ASTC_10x10 },
+        { "ASTC_12x10", QRhiTexture::ASTC_12x10 },
+        { "ASTC_12x12", QRhiTexture::ASTC_12x12 },
+        { nullptr, QRhiTexture::UnknownFormat }
+    };
 
     QScopedPointer<QRhi> rhi(QRhi::create(impl, initParams, QRhi::Flags(), nullptr));
     if (rhi) {
@@ -311,10 +353,20 @@ void dumpRhiBackendInfo(QTextStream &str, const char *name, QRhi::Implementation
         str << "  Max Color Attachments: " << rhi->resourceLimit(QRhi::MaxColorAttachments) << "\n";
         str << "  Frames in Flight: " << rhi->resourceLimit(QRhi::FramesInFlight) << "\n";
         str << "  Uniform Buffer Alignment: " << rhi->ubufAlignment() << "\n";
+        QByteArrayList supportedSampleCounts;
+        for (int s : rhi->supportedSampleCounts())
+            supportedSampleCounts << QByteArray::number(s);
+        str << "  Supported MSAA sample counts: " << supportedSampleCounts.join(',') << "\n";
         str << "  Features:\n";
         for (int i = 0; features[i].name; i++) {
             str << "    " << (rhi->isFeatureSupported(features[i].val) ? "v" : "-") << " " << features[i].name << "\n";
         }
+        str << "  Texture formats:";
+        for (int i = 0; textureFormats[i].name; i++) {
+            if (rhi->isTextureFormatSupported(textureFormats[i].val))
+                str << " " << textureFormats[i].name;
+        }
+        str << "\n";
     }
 }
 
@@ -326,7 +378,7 @@ void dumpRhiInfo(QTextStream &str)
     {
         QRhiGles2InitParams params;
         params.fallbackSurface = QRhiGles2InitParams::newFallbackSurface();
-        dumpRhiBackendInfo(str, "OpenGL ES2", QRhi::OpenGLES2, &params);
+        dumpRhiBackendInfo(str, "OpenGL (with default QSurfaceFormat)", QRhi::OpenGLES2, &params);
         delete params.fallbackSurface;
     }
 #endif
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/docbook/qml-int.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-int.xml
index 2dd4bc1c5..00ef9ec39 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-int.xml
+++ b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-int.xml
@@ -11,4 +11,11 @@
 <db:section xml:id="details">
 <db:title>Detailed Description</db:title>
 </db:section>
+<db:section xml:id="method-documentation">
+<db:title>Method Documentation</db:title>
+<db:section xml:id="abs-method">
+<db:title>int abs()</db:title>
+<db:para>Returns the absolute value of this integer.</db:para>
+</db:section>
+</db:section>
 </db:article>
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/expected_output/qml-int.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html
index 651f840cb..0b21da628 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html
@@ -15,9 +15,25 @@
 <div class="sidebar-content" id="sidebar-content"></div></div>
 <h1 class="title">int QML Basic Type</h1>
 <span class="subtitle"></span>
+<a name="methods"></a>
+<h2 id="methods">Methods</h2>
+<ul>
+<li class="fn">int <b><b><a href="qml-int.html#abs-method">abs</a></b></b>()</li>
+</ul>
 <!-- $$$int-description -->
 <div class="descr"> <a name="details"></a>
 </div>
 <!-- @@@int -->
+<h2>Method Documentation</h2>
+<!-- $$$abs[overload1]$$$abs -->
+<div class="qmlitem"><div class="qmlproto">
+<div class="table"><table class="qmlname">
+<tr valign="top" class="odd" id="abs-method">
+<td class="tblQmlFuncNode"><p>
+<a name="abs-method"></a><span class="type"><a href="qml-int.html">int</a></span> <span class="name">abs</span>()</p></td></tr>
+</table></div></div>
+<div class="qmldoc"><p>Returns the absolute value of this integer.</p>
+</div></div><!-- @@@abs -->
+<br/>
 </body>
 </html>
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 e0bed66c0..fed18491c 100644
--- a/tests/auto/qdoc/generatedoutput/qml/parent.qdoc
+++ b/tests/auto/qdoc/generatedoutput/testdata/qml/parent.qdoc
@@ -57,3 +57,8 @@
 
     \brief An integer basic type.
 */
+
+/*!
+    \qmlmethod int int::abs()
+    Returns the absolute value of this integer.
+*/
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 b703a844b..5d3055ac2 100644
--- a/tests/auto/qdoc/generatedoutput/testcpp.cpp
+++ b/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp
@@ -156,7 +156,8 @@ void TestDerived::virtualFun()
 
 /*!
     \fn TestQDoc::Test::overload()
-    \fn TestQDoc::Test::overload(bool b)
+    \fn Test::overload(bool b)
+     //! The second overload should match even without the fully qualified path
 
     Overloads that share a documentation comment, optionally taking
     a parameter \a b.
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");