diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-04 10:37:11 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-04 10:37:11 +0100 |
| commit | 49f30168c0d57f6af90ca90328aa575a305dae68 (patch) | |
| tree | 47d66e023425c8ebad02b97709b092fcf6f6d8ff /src/tools/qdoc | |
| parent | 8bb5dba0cba4d953794124d7f1b33887d1b5bd8d (diff) | |
| parent | 899604af55d7c31cea254ba655878b1f87c21a7c (diff) | |
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
Diffstat (limited to 'src/tools/qdoc')
| -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"; |