diff options
| -rw-r--r-- | README | 9 | ||||
| -rw-r--r-- | doc/src/developmenttools.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/examples.qdoc | 1 | ||||
| -rw-r--r-- | doc/src/internationalization/i18n.qdoc | 3 | ||||
| -rw-r--r-- | doc/src/platforms/linux.qdoc | 6 | ||||
| -rw-r--r-- | doc/src/platforms/macos.qdoc | 7 | ||||
| -rw-r--r-- | doc/src/platforms/windows.qdoc | 16 | ||||
| -rw-r--r-- | doc/src/qtmodules.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/reference.qdoc | 1 |
9 files changed, 2 insertions, 47 deletions
@@ -66,11 +66,7 @@ Section 3 Building Qt Documentation Section 4 Packaging the Documentation - To package the documentation for Qt Assistant, the HTML files must be - compiled into a QCH file (.qch). - Required binaries: - * assistant - found in qttools * qhelpgenerator - found in qttools To compile thq qch file for each module, first enter the output directory @@ -83,10 +79,7 @@ Section 4 Packaging the Documentation $> cd qtbase $> make qch_docs #builds the QCH files for modules in qtbase - The QCH file can then be loaded in Qt Assistant or Qt Creator. For Qt - Assistant, the QCH file may be registered to automatically load it. - - $> assistant -register qtdoc.qch #to automatically load the documentation + The QCH file can then be loaded in Qt Creator. Section 5 More Information diff --git a/doc/src/developmenttools.qdoc b/doc/src/developmenttools.qdoc index 1f46271e..fd604411 100644 --- a/doc/src/developmenttools.qdoc +++ b/doc/src/developmenttools.qdoc @@ -68,10 +68,6 @@ localizing applications: developers, translators, and release managers. You can run the lupdate and lrelease tools from the Qt Creator Tools menu. - \li \l{Qt Assistant Manual}{Qt Assistant} for viewing Qt documentation. - You can also view documentation in Qt Creator. The documentation - installed with Qt is displayed automatically in the Help - mode (3), and you can add documents to the list. \endlist Other tools are typically described in their context of use in other parts diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc index 979b3e27..c24955a4 100644 --- a/doc/src/examples.qdoc +++ b/doc/src/examples.qdoc @@ -182,7 +182,6 @@ \div {class="doc-column"} \b{Tools} \list - \li \l{Qt Assistant Examples} \li \l{Qt Designer Examples} \li \l{Qt Help Examples} \li \l{Qt Linguist Examples} diff --git a/doc/src/internationalization/i18n.qdoc b/doc/src/internationalization/i18n.qdoc index 899c0dd4..5f313357 100644 --- a/doc/src/internationalization/i18n.qdoc +++ b/doc/src/internationalization/i18n.qdoc @@ -226,9 +226,6 @@ \li Qt Module or Tool \li Catalog \row - \li \l {Qt Assistant Manual}{Qt Assistant} - \li \c assistant_ - \row \li \l [QtConcurrent]{Qt Concurrent} \li \c qtbase_ \row diff --git a/doc/src/platforms/linux.qdoc b/doc/src/platforms/linux.qdoc index 2d7ca5a6..be8fd022 100644 --- a/doc/src/platforms/linux.qdoc +++ b/doc/src/platforms/linux.qdoc @@ -441,12 +441,6 @@ \c{/usr/local/Qt-%VERSION%/lib}. On Linux with GCC this step is not needed. - \section1 Step 5: Build the Qt Documentation - - For the Qt reference documentation to be available in \l {Qt Assistant}, - you must build it separately: - - \snippet snippets/code/doc_src_installation.qdoc 24 */ /*! diff --git a/doc/src/platforms/macos.qdoc b/doc/src/platforms/macos.qdoc index 5e83bf59..10743609 100644 --- a/doc/src/platforms/macos.qdoc +++ b/doc/src/platforms/macos.qdoc @@ -365,13 +365,6 @@ \b {Qt is now installed.} - \section1 Step 5: Build the Qt Documentation - - For the Qt reference documentation to be available in \l {Qt Assistant}, you - must build it separately: - - \snippet snippets/code/doc_src_installation.qdoc 24 - \section1 Limitations \section2 Fink diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc index b510d675..80048e7e 100644 --- a/doc/src/platforms/windows.qdoc +++ b/doc/src/platforms/windows.qdoc @@ -1192,20 +1192,4 @@ \l{jom} is a replacement for \c nmake which makes use of all CPU cores and thus speeds up building. - \section1 Step 5: Build the Qt Documentation - - For the Qt reference documentation to be available in \l {Qt Assistant}, - you must build it separately: - - \badcode - nmake docs - \endcode - - This will build the documentation in the build folder. If you have - installed Qt in a separate location, you will also need to install - the documentation: - - \badcode - nmake install_docs - \endcode */ diff --git a/doc/src/qtmodules.qdoc b/doc/src/qtmodules.qdoc index 4373f7fd..9657bd7d 100644 --- a/doc/src/qtmodules.qdoc +++ b/doc/src/qtmodules.qdoc @@ -138,7 +138,7 @@ \li \l{Qt Help} \li All \li All - \li Classes for integrating documentation into applications, similar to Qt Assistant. + \li Classes for integrating documentation into applications. \row \li \l[QtImageFormats]{Qt Image Formats} \li All diff --git a/doc/src/reference.qdoc b/doc/src/reference.qdoc index e382eb35..0e721399 100644 --- a/doc/src/reference.qdoc +++ b/doc/src/reference.qdoc @@ -47,7 +47,6 @@ \list \li \l{Qt Creator Manual}{Qt Creator} \li \l{Qt Linguist Manual}{Qt Linguist} - \li \l{Qt Assistant Manual}{Qt Assistant} \li \l{Qt Designer Manual}{Qt Designer} \li \l{qmake Manual}{qmake} \li \l{QDoc Manual}{qdoc} |