diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-03-04 14:12:49 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-03-04 14:12:49 (GMT) |
| commit | 4b3953678983b3da925066f464b55340fab3503c (patch) | |
| tree | 54c6ed16cf6ab3eeea951bb933aab6cf7c25f25a | |
| parent | a3e7f41b085605b6856686b5dfd29818308bd820 (diff) | |
| download | Qt-4b3953678983b3da925066f464b55340fab3503c.zip Qt-4b3953678983b3da925066f464b55340fab3503c.tar.gz Qt-4b3953678983b3da925066f464b55340fab3503c.tar.bz2 | |
doc: Fixed some qdoc errors.
The QtMultimedia module needed to have its
own \page unique name so that the QtMultimedia
\module would not conflict with the QtMultimedia
\namespace.
| -rw-r--r-- | doc/src/modules.qdoc | 1 | ||||
| -rw-r--r-- | tools/qdoc3/cppcodeparser.cpp | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc index 9e1d340..76a52b4 100644 --- a/doc/src/modules.qdoc +++ b/doc/src/modules.qdoc @@ -130,6 +130,7 @@ /*! \module QtMultimedia + \page qtmultimedia-module.html \title QtMultimedia Module \contentspage All Qt Modules \previouspage QtCore diff --git a/tools/qdoc3/cppcodeparser.cpp b/tools/qdoc3/cppcodeparser.cpp index fef3c14..6884781 100644 --- a/tools/qdoc3/cppcodeparser.cpp +++ b/tools/qdoc3/cppcodeparser.cpp @@ -47,6 +47,7 @@ #include <stdio.h> #include <errno.h> +#include <qdebug.h> #include "codechunk.h" #include "config.h" @@ -1650,8 +1651,9 @@ bool CppCodeParser::matchNamespaceDecl(InnerNode *parent) */ QString namespaceName = previousLexeme(); NamespaceNode *namespasse = 0; - if (parent) + if (parent) { namespasse = static_cast<NamespaceNode*>(parent->findNode(namespaceName, Node::Namespace)); + } if (!namespasse) { namespasse = new NamespaceNode(parent, namespaceName); namespasse->setAccess(access); |