diff options
| -rw-r--r-- | doc/src/frameworks-technologies/graphicsview.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/overviews.qdoc | 13 | ||||
| -rw-r--r-- | doc/src/painting-and-printing/coordsys.qdoc | 1 | ||||
| -rw-r--r-- | doc/src/painting-and-printing/paintsystem.qdoc | 2 | ||||
| -rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 3 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt-html-templates.qdocconf | 27 |
6 files changed, 28 insertions, 20 deletions
diff --git a/doc/src/frameworks-technologies/graphicsview.qdoc b/doc/src/frameworks-technologies/graphicsview.qdoc index 95b3182..740fcac 100644 --- a/doc/src/frameworks-technologies/graphicsview.qdoc +++ b/doc/src/frameworks-technologies/graphicsview.qdoc @@ -47,7 +47,7 @@ /*! \page graphicsview.html \title The Graphics View Framework - \ingroup qt-gui-concepts + \ingroup qt-graphics \brief An overview of the Graphics View framework for interactive 2D graphics. diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc index bc994af..b2ba3a1 100644 --- a/doc/src/overviews.qdoc +++ b/doc/src/overviews.qdoc @@ -63,9 +63,18 @@ /*! \group qt-gui-concepts - \title Qt GUI Components + \title Qt GUI Construction - \brief The Qt components for constructing graphical user intefaces. + \brief The Qt components for constructing Graphical User Intefaces. + + \generatelist {related} + */ + +/*! + \group qt-graphics + \title Qt Graphics + + \brief The Qt components for doing graphics. \generatelist {related} */ diff --git a/doc/src/painting-and-printing/coordsys.qdoc b/doc/src/painting-and-printing/coordsys.qdoc index 5807f57..b0ba093 100644 --- a/doc/src/painting-and-printing/coordsys.qdoc +++ b/doc/src/painting-and-printing/coordsys.qdoc @@ -42,6 +42,7 @@ /*! \page coordsys.html \title The Coordinate System + \ingroup qt-graphics \brief Information about the coordinate system used by the paint system. diff --git a/doc/src/painting-and-printing/paintsystem.qdoc b/doc/src/painting-and-printing/paintsystem.qdoc index 56b638c..b711b2f 100644 --- a/doc/src/painting-and-printing/paintsystem.qdoc +++ b/doc/src/painting-and-printing/paintsystem.qdoc @@ -61,7 +61,7 @@ /*! \page paintsystem.html \title The Paint System - \ingroup qt-gui-concepts + \ingroup qt-graphics \ingroup frameworks-technologies Qt's paint system enables painting on screen and print devices diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 373fa3d..dfba368 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -1243,6 +1243,8 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner, subtitleText << "(" << Atom(Atom::AutoLink, fullTitle) << ")" << Atom(Atom::LineBreak); +#if 0 + // No longer used because the modeule name is a breadcrumb. QString fixedModule = inner->moduleName(); if (fixedModule == "Qt3SupportLight") fixedModule = "Qt3Support"; @@ -1263,6 +1265,7 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner, subtitleText << "]"; } } +#endif generateHeader(title, inner, marker); sections = marker->sections(inner, CodeMarker::Summary, CodeMarker::Okay); diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index 1450149..8b007db 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -42,11 +42,12 @@ HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \ " API Lookup</h2>\n" \ " <div id=\"list001\" class=\"list\">\n" \ " <ul id=\"ul001\" >\n" \ - " <li class=\"defaultLink\"><a href=\"modules.html\">All modules</a></li>\n" \ - " <li class=\"defaultLink\"><a href=\"classes.html\">All classes</a></li>\n" \ - " <li class=\"defaultLink\"><a href=\"functions.html\">All functions</a></li>\n" \ - " <li class=\"defaultLink\"><a href=\"namespaces.html\">All namespaces</a></li>\n" \ - " <li class=\"defaultLink\"><a href=\"platform-specific.html\">Platform specifics</a></li>\n" \ + " <li class=\"defaultLink\"><a href=\"classes.html\">Class index</a></li>\n" \ + " <li class=\"defaultLink\"><a href=\"functions.html\">Function index</a></li>\n" \ + " <li class=\"defaultLink\"><a href=\"modules.html\">Module list</a></li>\n" \ + " <li class=\"defaultLink\"><a href=\"namespaces.html\">Namespaces</a></li>\n" \ + " <li class=\"defaultLink\"><a href=\"qtglobal.html\">Global stuff</a></li>\n" \ + " <li class=\"defaultLink\"><a href=\"qdeclarativeelements.html\">QML table of elements</a></li>\n" \ " </ul> \n" \ " </div>\n" \ " <div id=\"live001\" class=\"live\">\n" \ @@ -54,20 +55,14 @@ HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \ " </div>\n" \ " <div class=\"box bottombar\" id=\"topics\">\n" \ " <h2><span></span>\n" \ - " API Topics</h2>\n" \ + " Qt Topics</h2>\n" \ " <div id=\"list002\" class=\"list\">\n" \ " <ul id=\"ul002\" >\n" \ - " <li class=\"defaultLink\"><a href=\"object.html\">QObject model</a></li>\n" \ - " <li class=\"defaultLink\"><a href=\"signalsandslots.html\">Signals & Slots</a></li>\n" \ - " <li class=\"defaultLink\"><a href=\"eventsandfilters.html\">Event handling</a></li>\n" \ + " <li class=\"defaultLink\"><a href=\"qt-basic-concepts.html\">Basic Concepts</a></li>\n" \ + " <li class=\"defaultLink\"><a href=\"qt-graphics.html\">Painting & Graphics</a></li>\n" \ + " <li class=\"defaultLink\"><a href=\"qt-gui-concepts.html\">GUI Components</a></li>\n" \ " <li class=\"defaultLink\"><a href=\"declarativeui.html\">Qt Quick</a></li>\n" \ - " <li class=\"defaultLink\"><a href=\"mainwindow.html\">The main window</a></li>\n" \ - " <li class=\"defaultLink\"><a href=\"widgets-and-layouts.html\">Widgets & Layouts</a></li>\n" \ - " <li class=\"defaultLink\"><a href=\"dialogs.html\">Dialog windows</a></li>\n" \ - " <li class=\"defaultLink\"><a href=\"paintsystem.html\">The paint system</a></li>\n" \ - " <li class=\"defaultLink\"><a href=\"graphicsview.html\">Graphics views</a></li>\n" \ - " <li class=\"defaultLink\"><a href=\"model-view-programming.html\">Model/View programming</a></li>\n" \ - " <li class=\"defaultLink\"><a href=\"widgets-and-layouts.html\">Widget style & layout</a></li>\n" \ + " <li class=\"defaultLink\"><a href=\"platform-specific.html\">Platform specifics</a></li>\n" \ " </ul> \n" \ " </div>\n" \ " <div id=\"live002\" class=\"live\">\n" \ |