diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-24 14:03:37 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-24 14:03:37 (GMT) |
| commit | a8030e0c543e538652605557843b845f89b11589 (patch) | |
| tree | 60ee6e2ed6e005a7cefd3ff5ba0bf1bbfb6930ac /doc/src/index.qdoc | |
| parent | ff6f17c92ad1bfa898bc89a5ccb65361d443c591 (diff) | |
| parent | f3771c5d91995b2beaa73bd3e3c783b76a887b50 (diff) | |
| download | Qt-a8030e0c543e538652605557843b845f89b11589.zip Qt-a8030e0c543e538652605557843b845f89b11589.tar.gz Qt-a8030e0c543e538652605557843b845f89b11589.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'doc/src/index.qdoc')
| -rw-r--r-- | doc/src/index.qdoc | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index 2272cf8..e45892f 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -52,34 +52,33 @@ </div> <div class="indexbox api"> <div class="heading"> - Qt API Overviews</div> + Qt API</div> <div class="indexboxcont indexboxbar "> <div class="sectionlist tricol"> <ul> - <li><a href="classes.html">Class index</a></li> - <li><a href="functions.html">Function index</a></li> - <li><a href="modules.html">Modules</a></li> - <li><a href="namespaces.html">Namespaces</a></li> + <li><a href="classes.html">All Classes</a></li> + <li><a href="functions.html">All Functions</a></li> + <li><a href="modules.html">All Modules</a></li> + <li><a href="namespaces.html">All Namespaces</a></li> <li><a href="qtglobal.html">Global Declarations</a></li> + <li><a href="licensing.html">Licenses and Credits</a></li> </ul> </div> <div class="sectionlist tricol"> <ul> - <li><a href="qt-basic-concepts.html">Basic Concepts</a></li> - <li><a href="qt-gui-concepts.html">GUI Components</a></li> + <li><a href="qt-basic-concepts.html">Programming with Qt</a></li> + <li><a href="qt-gui-concepts.html">UI Design with Qt</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="technology-apis.html">Qt and Key Technologies</a></li> + <li><a href="best-practices.html">Best Practices Guides</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> + <li><a href="qdeclarativeexamples.html">QML Examples and Demos</a></li> </ul> </div> </div> |