diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-08-12 07:10:59 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-08-12 07:10:59 (GMT) |
| commit | 81529d52a76b48aa89b7ac8c9044da4ea5c11f3f (patch) | |
| tree | 15804758bc6d213044fcacd8d00c88d8321ed1c9 /doc/src/index.qdoc | |
| parent | 03d9d3cf641c8dde22a903870ac2b6e58ada6eec (diff) | |
| parent | 773512d205df2ba7caa28b7b5cdbfbd6787a0967 (diff) | |
| download | Qt-81529d52a76b48aa89b7ac8c9044da4ea5c11f3f.zip Qt-81529d52a76b48aa89b7ac8c9044da4ea5c11f3f.tar.gz Qt-81529d52a76b48aa89b7ac8c9044da4ea5c11f3f.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'doc/src/index.qdoc')
| -rw-r--r-- | doc/src/index.qdoc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index 0609eb8..38586ef 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -65,18 +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">Basic Qt Architecture</a></li> <li><a href="qt-gui-concepts.html">UI Components</a></li> - <li><a href="developing-with-qt.html">Cross-platform & Platform-specific</a></li> - <li><a href="technology-apis.html">Qt API's for standard technologies </a></li> + <li><a href="developing-with-qt.html">Cross-platform & Platform-specific Development</a></li> + <li><a href="technology-apis.html">Qt & standard technologies </a></li> <li><a href="best-practices.html">Qt How-to's & best practices</a></li> </ul> </div> <div class="sectionlist"> <ul> - <li><a href="declarativeui.html">Qt Quick</a></li> + <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="qt-gui-concepts.html">UI components</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> @@ -101,8 +102,7 @@ <li><a href="assistant-manual.html">Qt Assistant</a></li> <li><a href="qmake-manual.html">Qt qmake</a></li> <li><a href="http://doc.qt.nokia.com/qtsimulator-1.0/simulator-description.html">Qt Simulator</a></li> - <li><a href="http://qt.nokia.com/developer/eclipse-integration">Eclipse Integration</a></li> - <li><a href="http://qt.nokia.com/products/appdev">Add-On Products and Services</a></li> + <li><a href="http://qt.nokia.com/developer/eclipse-integration">Integration</a> and <a href="http://qt.nokia.com/products/appdev">add-ins</a></li> <li><a href="qvfb.html">Virtual Framebuffer</a></li> </ul> </div> |