diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-23 02:48:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-23 02:48:58 (GMT) |
| commit | f9e40798aa82e6cc052979b8c4b22901070c8f04 (patch) | |
| tree | 68b206f5ef606900733f7b5ba3b062545540ae05 | |
| parent | 67e90b8a5701ef5b0653f012e74debc91e1b3b49 (diff) | |
| parent | df47c61d802f9149a95339515886c4d7ee99fa64 (diff) | |
| download | Qt-f9e40798aa82e6cc052979b8c4b22901070c8f04.zip Qt-f9e40798aa82e6cc052979b8c4b22901070c8f04.tar.gz Qt-f9e40798aa82e6cc052979b8c4b22901070c8f04.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:
Doc: changing template menus to better reflect links from the index page.
| -rw-r--r-- | tools/qdoc3/test/qt-html-templates.qdocconf | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index a14e696..c70bcaf 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -39,15 +39,17 @@ HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \ " <li><a href=\"modules.html\">Modules</a></li> \n" \ " <li><a href=\"namespaces.html\">Namespaces</a></li> \n" \ " <li><a href=\"qtglobal.html\">Global Declarations</a></li> \n" \ - " <li><a href=\"qdeclarativeelements.html\">QML elements</a></li> \n" \ + " <li><a href=\"licensing.html\">Licenses and Credits</a></li> \n" \ " </ul> \n" \ " </li> \n" \ " <li><a href=\"#\">Qt Topics</a> \n" \ " <ul id=\"topmenuTopic\"> \n" \ - " <li><a href=\"qt-basic-concepts.html\">Basic Qt architecture</a></li> \n" \ + " <li><a href=\"qt-basic-concepts.html\">Programming with Qt</a></li> \n" \ " <li><a href=\"qtquick.html\">Device UI's & Qt Quick</a></li> \n" \ - " <li><a href=\"qt-gui-concepts.html\">Desktop UI components</a></li> \n" \ + " <li><a href=\"qt-gui-concepts.html\">UI Design with Qt</a></li> \n" \ + " <li><a href=\"developing-with-qt.html\">Cross-platform and Platform-specific</a></li> \n" \ " <li><a href=\"platform-specific.html\">Platform-specific info</a></li> \n" \ + " <li><a href=\"technology-apis.html\">Qt and Key Technologies</a></li> \n" \ " <li><a href=\"best-practices.html\">How-To's and Best Practices</a></li> \n" \ " </ul> \n" \ " </li> \n" \ |