Merge remote-tracking branch 'origin/release' into stable

Change-Id: I625c46b86491fee66d39494d1466b2d616ea7380
2014-02-03 17:26:01 +01:00 · 2014-02-03 17:26:01 +01:00 · 899604af55
parent cfa8fcdda0 62feb088a3
commit 899604af55
1 changed files with 2 additions and 1 deletions
--- 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";