From 4b3953678983b3da925066f464b55340fab3503c Mon Sep 17 00:00:00 2001
From: Martin Smith <msmith@trolltech.com>
Date: Thu, 4 Mar 2010 15:12:49 +0100
Subject: 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.
---
 doc/src/modules.qdoc          | 1 +
 tools/qdoc3/cppcodeparser.cpp | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

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);
-- 
cgit v0.12