Exclude assistant from build

Task-number: QTBUG-86746
Tash-number: QTBUG-88123
Change-Id: Ia086ab9a7c193e7829ef886929dc921432f67a1b
Reviewed-by: Kai Koehne <kai.koehne@qt.io>

7 files changed, 16 insertions, 33 deletions

diff --git a/configure.cmake b/configure.cmake
index f895eb30c..13e84b839 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -27,10 +27,6 @@ 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
@@ -47,6 +43,10 @@ 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 4b8e64e79..285cafecc 100644
--- a/configure.json
+++ b/configure.json
@@ -14,11 +14,6 @@
         }
     },
     "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",
@@ -52,6 +47,11 @@
             "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 8a360b99e..a59e836e8 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -2,11 +2,6 @@
 
 qt_examples_build_begin()
 
-
-qt_exclude_tool_directories_from_default_target(
-    assistant
-)
-
 if(TARGET Qt::Widgets)
     add_subdirectory(help)
     add_subdirectory(linguist)
@@ -14,7 +9,6 @@ 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 2003bc514..763eae5d6 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,8 +1,4 @@
 TEMPLATE = subdirs
-qtHaveModule(widgets): SUBDIRS += help designer linguist uitools assistant
+qtHaveModule(widgets): SUBDIRS += help designer linguist uitools
 
-!qtConfig(process): SUBDIRS -= assistant designer
-
-qtNomakeTools( \
-    assistant \
-)
+!qtConfig(process): SUBDIRS -= designer
diff --git a/src/assistant/.prev_CMakeLists.txt b/src/assistant/.prev_CMakeLists.txt
index ea1eafc81..f14796e59 100644
--- a/src/assistant/.prev_CMakeLists.txt
+++ b/src/assistant/.prev_CMakeLists.txt
@@ -2,7 +2,6 @@
 
 
 qt_exclude_tool_directories_from_default_target(
-    assistant
     qhelpgenerator
     qcollectiongenerator
 )
@@ -10,10 +9,9 @@ qt_exclude_tool_directories_from_default_target(
 if(NOT TARGET Qt::Sql)
     return()
 endif()
-if(NOT QT_FEATURE_assistant)
+if(NOT QT_FEATURE_help)
     return()
 endif()
 add_subdirectory(help)
-add_subdirectory(assistant)
 add_subdirectory(qhelpgenerator)
 add_subdirectory(qcollectiongenerator)
diff --git a/src/assistant/CMakeLists.txt b/src/assistant/CMakeLists.txt
index 2ad364db8..6ec5c366d 100644
--- a/src/assistant/CMakeLists.txt
+++ b/src/assistant/CMakeLists.txt
@@ -7,7 +7,6 @@ endif()
 # special case end
 
 qt_exclude_tool_directories_from_default_target(
-    assistant
     qhelpgenerator
     qcollectiongenerator
 )
@@ -15,10 +14,9 @@ qt_exclude_tool_directories_from_default_target(
 if(NOT TARGET Qt::Sql)
     return()
 endif()
-if(NOT QT_FEATURE_assistant)
+if(NOT QT_FEATURE_help)
     return()
 endif()
 add_subdirectory(help)
-add_subdirectory(assistant)
 add_subdirectory(qhelpgenerator)
 add_subdirectory(qcollectiongenerator)
diff --git a/src/assistant/assistant.pro b/src/assistant/assistant.pro
index f3395abb0..c89035ae4 100644
--- a/src/assistant/assistant.pro
+++ b/src/assistant/assistant.pro
@@ -2,21 +2,18 @@ requires(qtHaveModule(sql))
 
 include($$OUT_PWD/../../src/global/qttools-config.pri)
 QT_FOR_CONFIG += tools-private
-requires(qtConfig(assistant))
+requires(qtConfig(help))
 
 TEMPLATE = subdirs
 
 SUBDIRS += \
            help \
-           assistant \
            qhelpgenerator \
            qcollectiongenerator
 
-assistant.depends = help
 qhelpgenerator.depends = help
 
 qtNomakeTools( \
-    assistant \
     qhelpgenerator \
     qcollectiongenerator \
 )