Revert "QDoc: Make Generator::fileBase static"

This reverts commit 3e67b5e4df84421b77f90cbf242abb4a3c4c93a5.

The original implementation where fileBase() was a virtual function,
overridden by HtmlGenerator, was needed as that generator is the
only one that conditionally appends '-obsolete' to output file names.

By using a shared static helper across all generators we broke that
feature.

Modify the revert to resolve conflicts and override fileBase() also
for WebXMLGenerator; .webxml output should not refer to files with
-obsolete suffix.

Pick-to: 6.0 6.1
Fixes: QTBUG-92478
Change-Id: I7a7e3ef333724c96624569dd27b4812196931fb0
Reviewed-by: Paul Wicking <paul.wicking@qt.io>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/qdoc/generator.cpp b/src/qdoc/generator.cpp
index 87b74ec56..5eaa7fbe9 100644
--- a/src/qdoc/generator.cpp
+++ b/src/qdoc/generator.cpp
@@ -326,7 +326,7 @@ static void transmogrify(QString &input, QString &output)
         output.chop(1);
 }
 
-QString Generator::fileBase(const Node *node)
+QString Generator::fileBase(const Node *node) const
 {
     if (!node->isPageNode() && !node->isCollectionNode())
         node = node->parent();
@@ -372,7 +372,7 @@ QString Generator::fileBase(const Node *node)
           module name.
         */
         if (!node->logicalModuleName().isEmpty()
-            && (!node->logicalModule()->isInternal() || Config::instance().showInternal()))
+            && (!node->logicalModule()->isInternal() || m_showInternal))
             base.prepend(node->logicalModuleName() + outputSuffix(node) + QLatin1Char('-'));
 
         base.prepend(outputPrefix(node));