summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-03-04 14:12:49 (GMT)
committerMartin Smith <msmith@trolltech.com>2010-03-04 14:12:49 (GMT)
commit4b3953678983b3da925066f464b55340fab3503c (patch)
tree54c6ed16cf6ab3eeea951bb933aab6cf7c25f25a /tools
parenta3e7f41b085605b6856686b5dfd29818308bd820 (diff)
downloadQt-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.
Diffstat (limited to 'tools')
-rw-r--r--tools/qdoc3/cppcodeparser.cpp4
1 files changed, 3 insertions, 1 deletions
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);