diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-03-08 01:43:00 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-03-08 01:43:00 (GMT) |
| commit | 56768688cc49c2dd2234598b41ebbfd046937ac5 (patch) | |
| tree | 029ced5da670e8b64901827508502454e0a167aa /tools/qdoc3/cppcodeparser.cpp | |
| parent | 038f6fc10092da1414fd2efff353671dbf862995 (diff) | |
| parent | 9bc81769eb6ebc9bd62fe3c1d86e67ddccbed8b6 (diff) | |
| download | Qt-56768688cc49c2dd2234598b41ebbfd046937ac5.zip Qt-56768688cc49c2dd2234598b41ebbfd046937ac5.tar.gz Qt-56768688cc49c2dd2234598b41ebbfd046937ac5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tools/qdoc3/cppcodeparser.cpp')
| -rw-r--r-- | tools/qdoc3/cppcodeparser.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/qdoc3/cppcodeparser.cpp b/tools/qdoc3/cppcodeparser.cpp index d9e9c3b..6884781 100644 --- a/tools/qdoc3/cppcodeparser.cpp +++ b/tools/qdoc3/cppcodeparser.cpp @@ -43,11 +43,11 @@ cppcodeparser.cpp */ -#include <QtCore> #include <qfile.h> #include <stdio.h> #include <errno.h> +#include <qdebug.h> #include "codechunk.h" #include "config.h" @@ -1651,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); |