Doc: Fix issues in Qt Help documentation

Fix following issues:
    - Outdated usage instructions on index page
    - Missing C++ class inheritance information
      caused by missing dependency to qtwidgets
    - Broken \snippet in 'Generating Qt Help'

Task-number: QTBUG-34897
Change-Id: I53dd0fbf41e1dfcd41e11f1ab19db7069839477a
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

diff --git a/src/assistant/help/doc/qthelp.qdocconf b/src/assistant/help/doc/qthelp.qdocconf
index a5581a0..bd2c527 100644 (file)
--- a/src/assistant/help/doc/qthelp.qdocconf
+++ b/src/assistant/help/doc/qthelp.qdocconf
@@ -26,7 +26,7 @@ qhp.QtHelp.subprojects.classes.sortPages = true
 
 language                = Cpp
 
-depends                 += qtdoc qtcore qtassistant
+depends                 += qtdoc qtcore qtassistant qtwidgets
 
 headerdirs += ..
 

diff --git a/src/assistant/help/doc/snippets/doc_src_qthelp.qdoc b/src/assistant/help/doc/snippets/doc_src_qthelp.qdoc
index c8f2ed9..1d9d8ce 100644 (file)
--- a/src/assistant/help/doc/snippets/doc_src_qthelp.qdoc
+++ b/src/assistant/help/doc/snippets/doc_src_qthelp.qdoc
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [1]
-CONFIG += help
+QT += help
 //! [1]
 
 

diff --git a/src/assistant/help/doc/src/qthelp.qdoc b/src/assistant/help/doc/src/qthelp.qdoc
index a191b02..ddd3c31 100644 (file)
--- a/src/assistant/help/doc/src/qthelp.qdoc
+++ b/src/assistant/help/doc/src/qthelp.qdoc
@@ -141,7 +141,7 @@
     an extension of \c .qhp, has to be created. After specifying all relevant
     information in this file, it needs to be compiled by calling:
 
-    \snippet doc/src/snippets/code/doc_src_qthelp.qdoc 2
+    \snippet doc_src_qthelp.qdoc 2
 
     The file 'doc.qch' contains then all HTML files in compressed
     form along with the table of contents and index keywords. To