diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-02 20:58:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-02 20:58:55 (GMT) |
| commit | 1358c4b53cf4cec83ea6d9b0f886b99f76c4847e (patch) | |
| tree | a019bc5a4fba7de4980c8f0cb5bee3e7a42f57f4 /doc | |
| parent | 0eee17b5d789c2314f582e363e377809ef6dea7c (diff) | |
| parent | eaf757a5c449e115ced427a0129fb2209fd09e29 (diff) | |
| download | Qt-1358c4b53cf4cec83ea6d9b0f886b99f76c4847e.zip Qt-1358c4b53cf4cec83ea6d9b0f886b99f76c4847e.tar.gz Qt-1358c4b53cf4cec83ea6d9b0f886b99f76c4847e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Consolidate zlib configuration redundancy
Fixed whitespace formatting
Fix incomplete support for built-in jpeg, mng, tiff and gif handlers
Split image handler plugin project files
No explicit link to zlib/jpeg for system mng/tiff
Removed stray line continuations
Long live else!
qdoc: Added a solution for creating tables of contents for manuals.
Doc: Fixed markup.
Fixed size hint for combo box on windows
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 da50a6d..18a1746 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -70,15 +70,15 @@ <li><a href="declarativeui.html">Device UI's & Qt Quick</a></li> <li><a href="qt-gui-concepts.html">Desktop UI components</a></li> <li><a href="platform-specific.html">Platform-specific info</a></li> - <li><a href="qt-graphics.html">Graphics, Painting & Printing</a></li> - <li><a href="qt-network.html">Input/Output & networking</a></li> + <li><a href="qt-graphics.html">Graphics, Painting & Printing</a></li> + <li><a href="qt-network.html">Input/Output & networking</a></li> </ul> </div> <div class="sectionlist"> <ul> <li><a href="model-view-programming.html">Model/View programming</a></li> <li><a href="technology-apis.html">Qt API's for other technologies</a></li> - <li><a href="best-practices.html">Qt How-to's & best practices</a></li> + <li><a href="best-practices.html">Qt How-to's & best practices</a></li> <li><a href="developing-with-qt.html">Cross-platform development</a></li> </ul> </div> |