summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMorten Engvoldsen <morten.engvoldsen@nokia.com>2010-08-20 14:58:29 +0200
committerMorten Engvoldsen <morten.engvoldsen@nokia.com>2010-08-20 14:58:29 +0200
commit8aa4ae683c24f46859a0e016809c2de49aead56f (patch)
treec951f0986e7800b1db0531e4bce4e9d0dadc82c3 /doc
parente079c49cbf821856ddb7da05146b1f2bee585fae (diff)
Doc: Changes to the index page and second level pages linking to the index page.
Diffstat (limited to 'doc')
-rw-r--r--doc/src/frameworks-technologies/model-view-programming.qdoc1
-rw-r--r--doc/src/index.qdoc10
-rw-r--r--doc/src/overviews.qdoc5
3 files changed, 10 insertions, 6 deletions
diff --git a/doc/src/frameworks-technologies/model-view-programming.qdoc b/doc/src/frameworks-technologies/model-view-programming.qdoc
index 7167f97598..e230c06bd5 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 2272cf8ada..95f940d71c 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 1c35a63ac8..8e12fd381a 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.