qdoc: Always set the URL for nodes read from index

Items written to index have the URL attribute set, but qdoc only used
it if it was able to resolve the relative index URL.

If the documentation was generated using a single-directory output
config, the relative index URL is an empty string (which is correct).
But even in that case, we need to set the href (filename + anchor) as
the node's URL.

Change-Id: If17cb9a42663b7d6f8f1444094129d5052699fbd
Reviewed-by: Martin Smith <martin.smith@qt.io>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/qdoc/qdocindexfiles.cpp b/src/qdoc/qdocindexfiles.cpp
index 4918fe795..22db2e3a7 100644
--- a/src/qdoc/qdocindexfiles.cpp
+++ b/src/qdoc/qdocindexfiles.cpp
@@ -610,9 +610,9 @@ void QDocIndexFiles::readIndexSection(QXmlStreamReader& reader,
         if (!physicalModuleName.isEmpty())
             qdb_->addToModule(physicalModuleName, node);
         if (!href.isEmpty()) {
-            if (node->isExternalPage())
-                node->setUrl(href);
-            else if (!indexUrl.isEmpty())
+            node->setUrl(href);
+            // Include the index URL if it exists
+            if (!node->isExternalPage() && !indexUrl.isEmpty())
                 node->setUrl(indexUrl + QLatin1Char('/') + href);
         }