diff options
Diffstat (limited to 'src/tools/qdoc')
-rw-r--r-- | src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc | 3 | ||||
-rw-r--r-- | src/tools/qdoc/doc/qdoc-manual-intro.qdoc | 5 | ||||
-rw-r--r-- | src/tools/qdoc/generator.cpp | 11 | ||||
-rw-r--r-- | src/tools/qdoc/helpprojectwriter.cpp | 3 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc b/src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc index 1f777ea441..446b441675 100644 --- a/src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc +++ b/src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc @@ -314,8 +314,7 @@ \endcode See how QDoc renders this property on the reference page for the - \l {changes-prop} {State} - type. + \l {State::changes}{State} type. \target obsolete-command \section1 \\obsolete diff --git a/src/tools/qdoc/doc/qdoc-manual-intro.qdoc b/src/tools/qdoc/doc/qdoc-manual-intro.qdoc index ad3779048a..f681c0a574 100644 --- a/src/tools/qdoc/doc/qdoc-manual-intro.qdoc +++ b/src/tools/qdoc/doc/qdoc-manual-intro.qdoc @@ -79,9 +79,8 @@ * / \endcode - From the QDoc comment above, QDoc generates the HTML page - \l {details} - {QObject Class Reference}. + From the QDoc comment above, QDoc generates the HTML \l {QObject} + {QObject class reference} page. This manual explains how to use the QDoc commands in QDoc comments to embed good documentation in your source files. It also explains diff --git a/src/tools/qdoc/generator.cpp b/src/tools/qdoc/generator.cpp index 3cbba788c8..b14a79dfab 100644 --- a/src/tools/qdoc/generator.cpp +++ b/src/tools/qdoc/generator.cpp @@ -1013,12 +1013,13 @@ void Generator::generateInnerNode(InnerNode* node) } } - NodeList::ConstIterator c = node->childNodes().constBegin(); - while (c != node->childNodes().constEnd()) { - if ((*c)->isInnerNode() && (*c)->access() != Node::Private) { - generateInnerNode((InnerNode*)*c); + int i = 0; + while (i < node->childNodes().count()) { + Node *c = node->childNodes().at(i); + if (c->isInnerNode() && c->access() != Node::Private) { + generateInnerNode((InnerNode*)c); } - ++c; + ++i; } } 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"; |