From b2e7709b55559ca20f627dff443b517421892779 Mon Sep 17 00:00:00 2001
From: Martin Smith <msmith@trolltech.com>
Date: Mon, 3 May 2010 13:23:47 +0200
Subject: qdoc: Added more API topics. Are these important?

---
 tools/qdoc3/htmlgenerator.cpp               |  2 ++
 tools/qdoc3/node.cpp                        |  2 +-
 tools/qdoc3/test/qt-html-templates.qdocconf | 11 ++++++++---
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index a0cd560..40145ff 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -1739,6 +1739,8 @@ void HtmlGenerator::generateBreadCrumbs(const QString& title,
             }
         }
         else if (node->subType() == Node::QmlClass) {
+            out() << "              <li><a href=\"" << fn->name() << "\">" << title
+                  << "</a></li>";
         }
         else if (node->subType() == Node::Example) {
             out() << "              <li><a href=\"examples.html\">All Examples</a></li>";
diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp
index a2bd948..4ba3a32 100644
--- a/tools/qdoc3/node.cpp
+++ b/tools/qdoc3/node.cpp
@@ -1289,7 +1289,7 @@ QmlClassNode::QmlClassNode(InnerNode *parent,
                            const ClassNode* cn)
     : FakeNode(parent, name, QmlClass), cnode(cn)
 {
-    setTitle((qmlOnly ? "" : "QML ") + name + " Element Reference");
+    setTitle((qmlOnly ? "" : "QML ") + name + " Element");
 }
 
 /*!
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 85a29c2..0651176 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -58,10 +58,15 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "          <div class=\"list\">\n" \
 			  "            <ul>\n" \
 			  "              <li><a href=\"object.html\">QObject model</a></li>\n" \
-			  "              <li><a href=\"eventsandfilters.html\">Events, signals &amp; slots</a></li>\n" \
-			  "              <li><a href=\"paintsystem.html\">Graphics &amp; Paint system</a></li>\n" \
+			  "              <li><a href=\"signalsandslots.html\">Signals &amp; Slots</a></li>\n" \
+			  "              <li><a href=\"eventsandfilters.html\">Event handling</a></li>\n" \
 			  "              <li><a href=\"declarativeui.html\">Qt Quick</a></li>\n" \
-			  "              <li><a href=\"widgets-and-layouts.html\">Widget style &amp; layout</a></li>\n" \
+			  "              <li><a href=\"mainwindow.html\">The main window</a></li>\n" \
+			  "              <li><a href=\"widgets-and-layouts.html\">Widgets &amp; Layouts</a></li>\n" \
+			  "              <li><a href=\"dialogs.html\">Dialog windows</a></li>\n" \
+			  "              <li><a href=\"paintsystem.html\">The paint system</a></li>\n" \
+			  "              <li><a href=\"graphicsview.html\">Graphics views</a></li>\n" \
+			  "              <li><a href=\"model-view-programming.html\">Model&#47;View programming</a></li>\n" \
 			  "            </ul>\n" \
 			  "          </div>\n" \
 			  "          <div class=\"live\">\n" \
-- 
cgit v0.12