diff options
| -rw-r--r-- | doc/src/frameworks-technologies/model-view-programming.qdoc | 1 | ||||
| -rw-r--r-- | doc/src/index.qdoc | 10 | ||||
| -rw-r--r-- | doc/src/overviews.qdoc | 5 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt-html-templates.qdocconf | 2 |
4 files changed, 11 insertions, 7 deletions
diff --git a/doc/src/frameworks-technologies/model-view-programming.qdoc b/doc/src/frameworks-technologies/model-view-programming.qdoc index 7167f97..e230c06 100644 --- a/doc/src/frameworks-technologies/model-view-programming.qdoc +++ b/doc/src/frameworks-technologies/model-view-programming.qdoc @@ -27,6 +27,7 @@ /*! \group model-view + \ingroup qt-basic-concepts \title Model/View Classes */ diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index 2272cf8..95f940d 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -52,7 +52,7 @@ </div> <div class="indexbox api"> <div class="heading"> - Qt API Overviews</div> + Qt API</div> <div class="indexboxcont indexboxbar "> <div class="sectionlist tricol"> <ul> @@ -65,21 +65,19 @@ </div> <div class="sectionlist tricol"> <ul> - <li><a href="qt-basic-concepts.html">Basic Concepts</a></li> + <li><a href="qt-basic-concepts.html">Programming with Qt</a></li> <li><a href="qt-gui-concepts.html">GUI Components</a></li> <li><a href="developing-with-qt.html">Cross-platform and Platform-specific</a></li> <li><a href="technology-apis.html">Qt APIs for standard technologies </a></li> <li><a href="best-practices.html">How-To Guides and Best Practices</a></li> - </ul> + <li><a href="qt-gui-concepts.html">Desktop UI components</a></li> + </ul> </div> <div class="sectionlist"> <ul> <li><a href="qtquick.html">Qt Quick</a></li> <li><a href="qdeclarativeintroduction.html">Introduction to QML</a></li> <li><a href="qdeclarativeelements.html">QML Elements</a></li> - <li><a href="model-view-programming.html">Model/View Programming</a></li> - <li><a href="qt-network.html">Network Programming</a></li> - <li><a href="qt-graphics.html">Graphics and Printing</a></li> </ul> </div> </div> diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc index 1c35a63..8e12fd3 100644 --- a/doc/src/overviews.qdoc +++ b/doc/src/overviews.qdoc @@ -62,6 +62,7 @@ /*! \group qt-graphics + \ingroup qt-basic-concepts \title Qt Graphics and Printing \brief The Qt components for doing graphics. @@ -71,6 +72,7 @@ /*! \group qt-network + \ingroup qt-basic-concepts \title Network programming with Qt \brief The these pages are about Qt's support for network programming. @@ -91,6 +93,7 @@ /*! \group qt-activex \title ActiveX in Qt + \ingroup qt-basic-concepts \ingroup technology-apis \ingroup platform-specific @@ -108,6 +111,8 @@ \brief Qt API's for using SQL. \ingroup technology-apis \ingroup best-practices + \ingroup qt-basic-concepts + These pages document Qt's API's for using SQL database systems in Qt applications. diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index 71b13ff..a14e696 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -86,7 +86,7 @@ HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \ " <li class=\"defaultLink\"><a href=\"functions.html\">Function index</a></li>\n" \ " <li class=\"defaultLink\"><a href=\"modules.html\">Modules</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=\"qtglobal.html\">Global Declarations</a></li>\n" \ " <li class=\"defaultLink\"><a href=\"qdeclarativeelements.html\">QML elements</a></li>\n" \ " </ul> \n" \ " </div>\n" \ |