Revert "Exclude assistant from build"

This reverts commit 7aeec24a9b8c00ee56891e4037406eca8271aa4d.

Reason for revert: See discussion in QTBUG-86746

Change-Id: I9e9cc95513a1b9b3685b10b262ae2ee7334caf69
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit 2a41769b64c166b5a93d1046e030fe22dc0834eb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

7 files changed, 33 insertions, 16 deletions

diff --git a/configure.cmake b/configure.cmake
index 13e84b839..f895eb30c 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -27,6 +27,10 @@ endif()
 
 #### Features
 
+qt_feature("assistant" PRIVATE
+    LABEL "Qt Assistant"
+    PURPOSE "Qt Assistant is a tool for viewing on-line documentation in Qt help file format."
+)
 qt_feature("clang" PRIVATE
     LABEL "QDoc"
     CONDITION TEST_libclang
@@ -43,10 +47,6 @@ qt_feature("distancefieldgenerator" PRIVATE
     LABEL "Qt Distance Field Generator"
     PURPOSE "The Qt Distance Field Generator tool can be used to pregenerate the font cache in order to optimize startup performance."
 )
-qt_feature("help" PRIVATE
-    LABEL "Qt Help"
-    PURPOSE "Qt Help is a library for accessing help contents to be able to integrate online help into Qt applications."
-)
 qt_feature("kmap2qmap" PRIVATE
     LABEL "kmap2qmap"
     PURPOSE "kmap2qmap is a tool to generate keymaps for use on Embedded Linux. The source files have to be in standard Linux kmap format that is e.g. understood by the kernel's loadkeys command."
@@ -94,11 +94,11 @@ qt_feature("windeployqt" PRIVATE
     CONDITION WIN32
 )
 qt_configure_add_summary_section(NAME "Qt Tools")
+qt_configure_add_summary_entry(ARGS "assistant")
 qt_configure_add_summary_entry(ARGS "clang")
 qt_configure_add_summary_entry(ARGS "clangcpp")
 qt_configure_add_summary_entry(ARGS "designer")
 qt_configure_add_summary_entry(ARGS "distancefieldgenerator")
-qt_configure_add_summary_entry(ARGS "help")
 qt_configure_add_summary_entry(ARGS "kmap2qmap")
 qt_configure_add_summary_entry(ARGS "linguist")
 qt_configure_add_summary_entry(ARGS "macdeployqt")
diff --git a/configure.json b/configure.json
index 285cafecc..4b8e64e79 100644
--- a/configure.json
+++ b/configure.json
@@ -14,6 +14,11 @@
         }
     },
     "features": {
+        "assistant": {
+            "label": "Qt Assistant",
+            "purpose": "Qt Assistant is a tool for viewing on-line documentation in Qt help file format.",
+            "output": [ "privateFeature" ]
+        },
         "clang": {
             "label": "QDoc",
             "condition": "tests.libclang",
@@ -47,11 +52,6 @@
             "purpose": "The Qt Distance Field Generator tool can be used to pregenerate the font cache in order to optimize startup performance.",
             "output": [ "privateFeature" ]
         },
-        "help": {
-            "label": "Qt Help",
-            "purpose": "Qt Help is a library for accessing help contents to be able to integrate online help into Qt applications.",
-            "output": [ "privateFeature" ]
-        },
         "kmap2qmap": {
             "label": "kmap2qmap",
             "purpose": "kmap2qmap is a tool to generate keymaps for use on Embedded Linux. The source files have to be in standard Linux kmap format that is e.g. understood by the kernel's loadkeys command.",
@@ -129,11 +129,11 @@ On macOS, you can use Homebrew's llvm package."
         {
             "section": "Qt Tools",
             "entries": [
+                "assistant",
                 "clang",
                 "clangcpp",
                 "designer",
                 "distancefieldgenerator",
-                "help",
                 "kmap2qmap",
                 "linguist",
                 "macdeployqt",
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index a59e836e8..8a360b99e 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -2,6 +2,11 @@
 
 qt_examples_build_begin()
 
+
+qt_exclude_tool_directories_from_default_target(
+    assistant
+)
+
 if(TARGET Qt::Widgets)
     add_subdirectory(help)
     add_subdirectory(linguist)
@@ -9,6 +14,7 @@ if(TARGET Qt::Widgets)
 endif()
 if(QT_FEATURE_process AND TARGET Qt::Widgets)
     add_subdirectory(designer)
+    add_subdirectory(assistant)
 endif()
 
 qt_examples_build_end()
diff --git a/examples/examples.pro b/examples/examples.pro
index 763eae5d6..2003bc514 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,4 +1,8 @@
 TEMPLATE = subdirs
-qtHaveModule(widgets): SUBDIRS += help designer linguist uitools
+qtHaveModule(widgets): SUBDIRS += help designer linguist uitools assistant
 
-!qtConfig(process): SUBDIRS -= designer
+!qtConfig(process): SUBDIRS -= assistant designer
+
+qtNomakeTools( \
+    assistant \
+)
diff --git a/src/assistant/.prev_CMakeLists.txt b/src/assistant/.prev_CMakeLists.txt
index ca9602488..8aed08549 100644
--- a/src/assistant/.prev_CMakeLists.txt
+++ b/src/assistant/.prev_CMakeLists.txt
@@ -2,14 +2,16 @@
 
 
 qt_exclude_tool_directories_from_default_target(
+    assistant
     qhelpgenerator
 )
 
 if(NOT TARGET Qt::Sql)
     return()
 endif()
-if(NOT QT_FEATURE_help)
+if(NOT QT_FEATURE_assistant)
     return()
 endif()
 add_subdirectory(help)
+add_subdirectory(assistant)
 add_subdirectory(qhelpgenerator)
diff --git a/src/assistant/CMakeLists.txt b/src/assistant/CMakeLists.txt
index aac72a768..27f9024f8 100644
--- a/src/assistant/CMakeLists.txt
+++ b/src/assistant/CMakeLists.txt
@@ -7,14 +7,16 @@ endif()
 # special case end
 
 qt_exclude_tool_directories_from_default_target(
+    assistant
     qhelpgenerator
 )
 
 if(NOT TARGET Qt::Sql)
     return()
 endif()
-if(NOT QT_FEATURE_help)
+if(NOT QT_FEATURE_assistant)
     return()
 endif()
 add_subdirectory(help)
+add_subdirectory(assistant)
 add_subdirectory(qhelpgenerator)
diff --git a/src/assistant/assistant.pro b/src/assistant/assistant.pro
index 078aca637..3a8ef644e 100644
--- a/src/assistant/assistant.pro
+++ b/src/assistant/assistant.pro
@@ -2,16 +2,19 @@ requires(qtHaveModule(sql))
 
 include($$OUT_PWD/../../src/global/qttools-config.pri)
 QT_FOR_CONFIG += tools-private
-requires(qtConfig(help))
+requires(qtConfig(assistant))
 
 TEMPLATE = subdirs
 
 SUBDIRS += \
            help \
+           assistant \
            qhelpgenerator
 
+assistant.depends = help
 qhelpgenerator.depends = help
 
 qtNomakeTools( \
+    assistant \
     qhelpgenerator \
 )