diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-04 14:16:35 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-04 14:16:35 (GMT) |
| commit | 84fdd4be15a8fa2ea921a112a05b185ffd59cc04 (patch) | |
| tree | dd4539a6f6eeccb05d02bce338b7f755504dcff6 /doc/src/index.qdoc | |
| parent | 245a68a0aad0473fcf56cd75e78b951480d39e2b (diff) | |
| parent | ae1c9def5cb22d88cf10b2a23d06bc38da12725b (diff) | |
| download | Qt-84fdd4be15a8fa2ea921a112a05b185ffd59cc04.zip Qt-84fdd4be15a8fa2ea921a112a05b185ffd59cc04.tar.gz Qt-84fdd4be15a8fa2ea921a112a05b185ffd59cc04.tar.bz2 | |
Merge branch '4.7' of 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 | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index b5e73ed..7efd1e6 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -40,8 +40,8 @@ </div> <div class="section sectionlist"> <ul> - <li><a href="">Getting started</a></li> - <li><a href="installation.html">Installation & first steps</a></li> + <li><a href="gettingstarted.html">Getting started</a></li> + <li><a href="installation.html">Installation</a></li> <li><a href="how-to-learn-qt.html">How to learn Qt</a></li> <li><a href="tutorials.html">Tutorials</a></li> <li><a href="all-examples.html">Examples</a></li> @@ -65,8 +65,8 @@ </div> <div class="sectionlist tricol"> <ul> - <li><a href="qt-basic-concepts.html">Programming with Qt</a></li> - <li><a href="qt-basic-concepts.html">Qt Architecture</a></li> + <!-- <li><a href="qt-basic-concepts.html">Programming with Qt</a></li> --> + <li><a href="qt-basic-concepts.html">Basic Qt Architecture</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> @@ -78,7 +78,7 @@ <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="declarativeui.html">Qt & GUI design</a></li> + <!-- <li><a href="declarativeui.html">Qt & GUI design</a></li> --> </ul> </div> </div> @@ -94,11 +94,12 @@ </div> <div class="section sectionlist"> <ul> - <li><a href="http://doc.qt.nokia.com/qtcreator-1.3/index.html">Qt Creator</a></li> + <li><a href="http://doc.qt.nokia.com/qtcreator-2.0/index.html">Qt Creator</a> (online document)</li> <li><a href="designer-manual.html">Qt Designer</a></li> <li><a href="linguist-manual.html">Qt Linguist</a></li> <li><a href="assistant-manual.html">Qt Assistant</a></li> - <li><a href="http://doc.qt.nokia.com/">Integration and add-ins</a></li> + <li><a href="http://doc.qt.nokia.com/qtsimulator-1.0/simulator-description.html">Qt Simulator</a> (online document)</li> + <li><a href="http://qt.nokia.com/developer/eclipse-integration">Integration</a> (online document) and <a href="http://qt.nokia.com/products/appdev">add-ins</a> (online document)</li> <li><a href="qvfb.html">Virtual Framebuffer</a></li> </ul> </div> |