diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2012-11-20 10:08:29 +0100 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2012-11-20 10:12:44 +0100 |
| commit | 0dc61c4216697a2c4066d4735b4be941e869e514 (patch) | |
| tree | 8a3876897fc5144cc2f9b28223ff9548944a8775 /src/tools/qdoc/cppcodeparser.cpp | |
| parent | b98b11fa036ea301d1483df6f533ec55be727d9d (diff) | |
| parent | a769a212e0c22283fc05d3f49c252f8e2a62ba3f (diff) | |
Merge branch 'newdocs'
Added prepare_docs to qt_build_config.prf (it was added
directly in configure in the source branch)
Conflicts:
configure
tools/configure/configureapp.cpp
Change-Id: I1337c69fc62b1c934e3e39b4409e4857440c9db8
Diffstat (limited to 'src/tools/qdoc/cppcodeparser.cpp')
| -rw-r--r-- | src/tools/qdoc/cppcodeparser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/qdoc/cppcodeparser.cpp b/src/tools/qdoc/cppcodeparser.cpp index d4fe0ff5f7..2fc3a6c477 100644 --- a/src/tools/qdoc/cppcodeparser.cpp +++ b/src/tools/qdoc/cppcodeparser.cpp @@ -2156,8 +2156,8 @@ bool CppCodeParser::matchDocsAndStuff() while (n != nodes.end()) { processOtherMetaCommands(*d, *n); (*n)->setDoc(*d); - if ((*n)->isInnerNode() && - ((InnerNode *)*n)->includes().isEmpty()) { + checkModuleInclusion(*n); + if ((*n)->isInnerNode() && ((InnerNode *)*n)->includes().isEmpty()) { InnerNode *m = static_cast<InnerNode *>(*n); while (m->parent() != qdb_->treeRoot()) m = m->parent(); |