diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-03-17 12:19:10 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-03-17 12:19:10 (GMT) |
| commit | 63520c42a85cc4b3d7e5da6f14b6e12774274fef (patch) | |
| tree | 7229b0e3bdf624f3d07906027d40085075c1aec6 /tools/qdoc3/htmlgenerator.cpp | |
| parent | 8a5cd17c49888e5b6cb230516e1722af9adba251 (diff) | |
| parent | ed08d67fea713e550da0fd0542672cc4443806e2 (diff) | |
| download | Qt-63520c42a85cc4b3d7e5da6f14b6e12774274fef.zip Qt-63520c42a85cc4b3d7e5da6f14b6e12774274fef.tar.gz Qt-63520c42a85cc4b3d7e5da6f14b6e12774274fef.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts:
configure.exe
src/declarative/util/qdeclarativelistmodel.cpp
tools/qml/qml.pro
Diffstat (limited to 'tools/qdoc3/htmlgenerator.cpp')
| -rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 411a886..c1e3678 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -703,8 +703,6 @@ int HtmlGenerator::generateAtom(const Atom *atom, case Node::Fake: if (node->subType() == Node::QmlClass) { sections[QmlClass].appendMember((Node*)node); - //qDebug() << "HtmlGenerator::generateAtom(): Atom::SinceList, append" - // << node->name(); } break; case Node::Namespace: @@ -3769,7 +3767,6 @@ void HtmlGenerator::findAllSince(const InnerNode *node) className = (*child)->parent()->name()+"::"+className; nsmap.value().insert(className,(*child)); nqcmap.value().insert(className,(*child)); - //qDebug() << "findAllSince(): insert" << className << sinceVersion; } } else { @@ -3991,10 +3988,12 @@ QString HtmlGenerator::getLink(const Atom *atom, } else { *node = marker->resolveTarget(first, myTree, relative); - if (!*node) + if (!*node) { *node = myTree->findFakeNodeByTitle(first); - if (!*node) + } + if (!*node) { *node = myTree->findUnambiguousTarget(first, targetAtom); + } } if (*node) { |