qdoc: Restore support for output in one directory

The basic functionality is working. Add these lines
to qt-html-templates-offline.qdocconf, or add them
to the online version:

HTML.nosubdirs            = "true"
HTML.outputsubdir         = "html"

Before it opens a .html file for writing, it tests
whether the file alread exists. If so, it writes an
error message, e.g.:

...platform-notes.qdoc:140: error: HTML file already exists;
overwriting .../doc/html/platform-notes-windows.html

There are currently nearly 100 files being overwritten for Qt5.

Task-number: QTBUG-32580
Change-Id: I02b103fd00b9d1e624665ac518d571acc791be9d
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

1 files changed, 9 insertions, 4 deletions

diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp
index 54861f4e02..0f68c12039 100644
--- a/src/tools/qdoc/htmlgenerator.cpp
+++ b/src/tools/qdoc/htmlgenerator.cpp
@@ -2361,7 +2361,10 @@ QString HtmlGenerator::generateLowStatusMemberFile(InnerNode *inner,
         fileName = fileBase(inner) + "-obsolete." + fileExtension();
     }
     if (status == CodeMarker::Obsolete) {
-        QString link = QString("../" + Generator::outputSubdir() + QLatin1Char('/')) + fileName;
+        QString link;
+        if (useOutputSubdirs() && !Generator::outputSubdir().isEmpty())
+            link = QString("../" + Generator::outputSubdir() + QLatin1Char('/'));
+        link += fileName;
         inner->setObsoleteLink(link);
     }
 
@@ -2703,8 +2706,10 @@ void HtmlGenerator::generateCompactList(ListType listType,
             }
             else if (listType == Obsolete) {
                 QString fileName = fileBase(it.value()) + "-obsolete." + fileExtension();
-                QString link = QString("../" + it.value()->outputSubdirectory() +
-                                       QLatin1Char('/')) + fileName;
+                QString link;
+                if (useOutputSubdirs())
+                    link = QString("../" + it.value()->outputSubdirectory() + QLatin1Char('/'));
+                link += fileName;
                 out() << "<a href=\"" << link << "\">";
             }
 
@@ -3598,7 +3603,7 @@ QString HtmlGenerator::linkForNode(const Node *node, const Node *relative)
       back down into the other subdirectory.
      */
     if (node && relative && (node != relative)) {
-        if (node->outputSubdirectory() != relative->outputSubdirectory())
+        if (useOutputSubdirs() && node->outputSubdirectory() != relative->outputSubdirectory())
             link.prepend(QString("../" + node->outputSubdirectory() + QLatin1Char('/')));
     }
     return link;