Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

1 files changed, 14 insertions, 0 deletions

diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 659011473..425c50b12 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -537,6 +537,20 @@ int HtmlGenerator::generateAtom(const Atom *atom,
             out() << formattingRightMap()[atom->string()];
         }
         break;
+    case Atom::AnnotatedList:
+        {
+            const FakeNode *fake = static_cast<const FakeNode *>(relative);
+            if (fake && !fake->groupMembers().isEmpty()) {
+                QList<Node*> values = tre->groups().values(atom->string());
+                QMap<QString, const Node*> nodeMap;
+                for (int i = 0; i < values.size(); ++i) {
+                    const Node* n = values.at(i);
+                    nodeMap.insert(n->name(),n);
+                }
+                generateAnnotatedList(fake, marker, nodeMap);
+            }
+        }
+        break;
     case Atom::GeneratedList:
         if (atom->string() == "annotatedclasses") {
             generateAnnotatedList(relative, marker, nonCompatClasses);