diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-08-05 14:56:50 +0200 |
|---|---|---|
| committer | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-08-13 11:03:39 +0200 |
| commit | 7723e081fb28c53eb08c0a88386c1a5f14a0a13e (patch) | |
| tree | 4393cd7be712d755fabc6fc0fcd10eee075ebb47 /doc | |
| parent | c12f452dc06a9a0dfb244dc5124cfca0b3973b0d (diff) | |
qdoc: added application flags in doc.pri and fixed QTBUG-12388
Task-nr: QTBUG-12388
(cherry picked from commit c1ce7b4b01c1049c61881bb7d701ed68b92a401b)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/doc.pri | 4 | ||||
| -rw-r--r-- | doc/src/index.qdoc | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index f748f3d7d9..e1efa210dc 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -19,8 +19,8 @@ $$unixstyle { QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && set QT_BUILD_TREE=$$QT_BUILD_TREE&& set QT_SOURCE_TREE=$$QT_SOURCE_TREE&& $$QT_BUILD_TREE/bin/qdoc3.exe $$DOCS_GENERATION_DEFINES QDOC = $$replace(QDOC, "/", "\\") } -ADP_DOCS_QDOCCONF_FILE = qt-build-docs.qdocconf -QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \ +ADP_DOCS_QDOCCONF_FILE = -online qt-build-docs.qdocconf +QT_DOCUMENTATION = ($$QDOC -assistant qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \ linguist.qdocconf qmake.qdocconf qdeclarative.qdocconf) && \ (cd $$QT_BUILD_TREE && \ $$GENERATOR doc-build/html-qt/qt.qhp -o doc/qch/qt.qch && \ diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index 466e1704b4..f15032cc09 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -94,12 +94,14 @@ </div> <div class="section sectionlist"> <ul> - <li><a href="http://doc.qt.nokia.com/qtcreator-2.0/index.html">Qt Creator</a> (online document)</li> + <li><a href="http://doc.qt.nokia.com/qtcreator-2.0/index.html">Qt Creator</a> (online)</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> (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="qmake-manual.html">Qt qmake</a></li> + <li><a href="http://doc.qt.nokia.com/qtsimulator-1.0/simulator-description.html">Qt Simulator</a> (online)</li> + <li><a href="http://qt.nokia.com/developer/eclipse-integration">Eclipse Integration</a> (online)</li> + <li><a href="http://qt.nokia.com/products/appdev">Add-On Products and Services</a> (online)</li> <li><a href="qvfb.html">Virtual Framebuffer</a></li> </ul> </div> |