summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorKevin Wright <kevin.wright@nokia.com>2010-07-26 16:44:10 (GMT)
committerKevin Wright <kevin.wright@nokia.com>2010-07-26 16:44:10 (GMT)
commit64087b078f3767a2190f2b4a0d4aca2a6165ebda (patch)
treed72bb90cd7e7eab227520de1be47c46eaf91f6c7 /doc/src
parent48656520b76abe76c114fce4b466360e7e2f628f (diff)
downloadQt-64087b078f3767a2190f2b4a0d4aca2a6165ebda.zip
Qt-64087b078f3767a2190f2b4a0d4aca2a6165ebda.tar.gz
Qt-64087b078f3767a2190f2b4a0d4aca2a6165ebda.tar.bz2
Fixed the following sub-tasks for QTBUG-12192
* Qt Simulator link missing * Integration and add-ins (on the front page, link leads to an alternative start page) * Qt Creator (on the front page link leads to Manual version 1.3) * Getting Started (on the front page) link broken * More... (in Global Declarations) link broken Additionally: There was an issue with the documentation used within Assistant/Creator that appears to have no bug report filed. An alternate "offline" form of the documentation (inspired by the newly redesigned online version) was being installed, but had significant issues within Assistant and Creator. It appears that within qdoc3 some changes had been made towards using this newer documentation format, but those changes were not working properly. I fixed qdoc3 so that the original offline documentation design is the default, but there is room to use the configuration files to call the any of the three documentation designs (new online, new offline, and old offline).
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/index.qdoc5
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 0ecae59..bd3ac05 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -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></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></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>