diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-08-02 18:09:12 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-08-02 18:09:12 (GMT) |
| commit | db6eb60eb0246b1c938e22012be15a317fa64342 (patch) | |
| tree | 8091b0112cd481b44c5e5ea477bbe5b189f337b1 /doc | |
| parent | 5e61d763ec24016a92bb91e5eb39c54d9e28b913 (diff) | |
| parent | 41ae34d84a2d5024b5d42a25a2bf97b6a6dd8412 (diff) | |
| download | Qt-db6eb60eb0246b1c938e22012be15a317fa64342.zip Qt-db6eb60eb0246b1c938e22012be15a317fa64342.tar.gz Qt-db6eb60eb0246b1c938e22012be15a317fa64342.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/index.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index 55c7545..7efd1e6 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -94,12 +94,12 @@ </div> <div class="section sectionlist"> <ul> - <li><a href="http://doc.qt.nokia.com/qtcreator-2.0/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/qtsimulator-1.0/simulator-description.html">Qt Simulator</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="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> |