From 62feb088a30045e7fbd2a3074c64d18035b84a97 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Mon, 27 Jan 2014 15:08:21 +0100 Subject: qdoc: Never use a collision page as a main QCH landing page When writing the main/landing page for a documentation set to a .qhp file, check that it's not a collision page. If it is, default to 'index.html' instead. Task-number: QTCREATORBUG-11035 Change-Id: I0269834f6e50fcf5ae779c026263e69e4c3cd7b6 Reviewed-by: Martin Smith --- src/tools/qdoc/helpprojectwriter.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tools/qdoc/helpprojectwriter.cpp b/src/tools/qdoc/helpprojectwriter.cpp index 44292f84bb..d46f887518 100644 --- a/src/tools/qdoc/helpprojectwriter.cpp +++ b/src/tools/qdoc/helpprojectwriter.cpp @@ -657,7 +657,8 @@ void HelpProjectWriter::generateProject(HelpProject &project) if (node == 0) node = qdb_->findNode(QStringList("index.html")); QString indexPath; - if (node) + // Never use a collision node as a landing page + if (node && !node->isCollisionNode()) indexPath = gen_->fullDocumentLocation(node,Generator::useOutputSubdirs()); else indexPath = "index.html"; -- cgit v1.2.3