qdoc: Fixed incorrect href attribute values in qdoc

There were two fileBase() functions, but only one
was correct. The wrong one was being called in some
cases. Now there is only one fileBase() function,
which is always called.

Task nr: QTBUG-26591

Change-Id: I2c40e2152a8c7ad1bb9db256ecf1367148f0e7f6
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp
index 769e0ae5f3..ecd974921e 100644
--- a/src/tools/qdoc/htmlgenerator.cpp
+++ b/src/tools/qdoc/htmlgenerator.cpp
@@ -210,8 +210,8 @@ void HtmlGenerator::initializeGenerator(const Config &config)
     codeIndent = config.getInt(CONFIG_CODEINDENT);
 
     helpProjectWriter = new HelpProjectWriter(config,
-                                              project.toLower() +
-                                              ".qhp");
+                                              project.toLower() + ".qhp",
+                                              this);
 
     // Documentation template handling
     headerScripts = config.getString(HtmlGenerator::format() + Config::dot +
@@ -3838,7 +3838,7 @@ void HtmlGenerator::generateIndex(const QString &fileBase,
                                   const QString &url,
                                   const QString &title)
 {
-    tree_->generateIndex(outputDir() + QLatin1Char('/') + fileBase + ".index", url, title);
+    tree_->generateIndex(outputDir() + QLatin1Char('/') + fileBase + ".index", url, title, this);
 }
 
 void HtmlGenerator::generateStatus(const Node *node, CodeMarker *marker)
@@ -4318,7 +4318,7 @@ void HtmlGenerator::generateManifestFile(QString manifest, QString element)
         }
         writer.writeStartElement(element);
         writer.writeAttribute("name", en->title());
-        QString docUrl = manifestDir + en->fileBase() + ".html";
+        QString docUrl = manifestDir + fileBase(en) + ".html";
         writer.writeAttribute("docUrl", docUrl);
         QStringList proFiles;
         foreach (const Node* child, en->childNodes()) {