diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-03 17:26:01 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-03 17:26:01 +0100 |
| commit | 899604af55d7c31cea254ba655878b1f87c21a7c (patch) | |
| tree | c089f03308fbf44b229bee933f55daa06ce6e67a /src/tools | |
| parent | cfa8fcdda0e4b453b8a808946735714cfca2bfef (diff) | |
| parent | 62feb088a30045e7fbd2a3074c64d18035b84a97 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I625c46b86491fee66d39494d1466b2d616ea7380
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/qdoc/helpprojectwriter.cpp | 3 |
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"; |