summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2014-01-27 15:08:21 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-29 14:15:00 +0100
commit62feb088a30045e7fbd2a3074c64d18035b84a97 (patch)
treeeae0ab5083e92f9628fbd541f604bb495cb09e1f
parentaac064b1c74fc902eb0d3ffd4fa79acf1c85a6df (diff)
qdoc: Never use a collision page as a main QCH landing pagev5.2.1
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 <martin.smith@digia.com>
-rw-r--r--src/tools/qdoc/helpprojectwriter.cpp3
1 files changed, 2 insertions, 1 deletions
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";