CMake: Regenerate qttools

Change-Id: I215dd95fe4467b2b2a7c24b1b5be523ef2e83980
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

8 files changed, 22 insertions, 4 deletions

diff --git a/src/assistant/.prev_CMakeLists.txt b/src/assistant/.prev_CMakeLists.txt
index 013dfa121..ea1eafc81 100644
--- a/src/assistant/.prev_CMakeLists.txt
+++ b/src/assistant/.prev_CMakeLists.txt
@@ -10,6 +10,9 @@ qt_exclude_tool_directories_from_default_target(
 if(NOT TARGET Qt::Sql)
     return()
 endif()
+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 3078b3d8e..2ad364db8 100644
--- a/src/assistant/CMakeLists.txt
+++ b/src/assistant/CMakeLists.txt
@@ -15,6 +15,9 @@ qt_exclude_tool_directories_from_default_target(
 if(NOT TARGET Qt::Sql)
     return()
 endif()
+if(NOT QT_FEATURE_assistant)
+    return()
+endif()
 add_subdirectory(help)
 add_subdirectory(assistant)
 add_subdirectory(qhelpgenerator)
diff --git a/src/assistant/help/.prev_CMakeLists.txt b/src/assistant/help/.prev_CMakeLists.txt
index f6c0622e0..2ecde4d80 100644
--- a/src/assistant/help/.prev_CMakeLists.txt
+++ b/src/assistant/help/.prev_CMakeLists.txt
@@ -19,6 +19,7 @@ qt_add_module(Help
         qhelpfiltersettings.cpp qhelpfiltersettings_p.h
         qhelpfiltersettingswidget.cpp qhelpfiltersettingswidget.h qhelpfiltersettingswidget.ui
         qhelpindexwidget.cpp qhelpindexwidget.h
+        qhelplink.cpp qhelplink.h
         qhelpsearchengine.cpp qhelpsearchengine.h
         qhelpsearchindexreader.cpp qhelpsearchindexreader_p.h
         qhelpsearchindexreader_default.cpp qhelpsearchindexreader_default_p.h
diff --git a/src/assistant/help/CMakeLists.txt b/src/assistant/help/CMakeLists.txt
index 1701e6781..e80ee44ac 100644
--- a/src/assistant/help/CMakeLists.txt
+++ b/src/assistant/help/CMakeLists.txt
@@ -19,6 +19,7 @@ qt_add_module(Help
         qhelpfiltersettings.cpp qhelpfiltersettings_p.h
         qhelpfiltersettingswidget.cpp qhelpfiltersettingswidget.h qhelpfiltersettingswidget.ui
         qhelpindexwidget.cpp qhelpindexwidget.h
+        qhelplink.cpp qhelplink.h
         qhelpsearchengine.cpp qhelpsearchengine.h
         qhelpsearchindexreader.cpp qhelpsearchindexreader_p.h
         qhelpsearchindexreader_default.cpp qhelpsearchindexreader_default_p.h
diff --git a/src/assistant/qcollectiongenerator/.prev_CMakeLists.txt b/src/assistant/qcollectiongenerator/.prev_CMakeLists.txt
index ba927bd78..cfbcfc0ae 100644
--- a/src/assistant/qcollectiongenerator/.prev_CMakeLists.txt
+++ b/src/assistant/qcollectiongenerator/.prev_CMakeLists.txt
@@ -4,7 +4,9 @@
 ## qcollectiongenerator Tool:
 #####################################################################
 
-qt_add_tool(qcollectiongenerator
+qt_get_tool_target_name(target_name qcollectiongenerator)
+qt_add_tool(${target_name}
+    TARGET_DESCRIPTION "Qt Help Collection File Generator"
     SOURCES
         main.c
     PUBLIC_LIBRARIES
diff --git a/src/assistant/qcollectiongenerator/CMakeLists.txt b/src/assistant/qcollectiongenerator/CMakeLists.txt
index cfd7cd92c..97c8740d0 100644
--- a/src/assistant/qcollectiongenerator/CMakeLists.txt
+++ b/src/assistant/qcollectiongenerator/CMakeLists.txt
@@ -4,7 +4,9 @@
 ## qcollectiongenerator Tool:
 #####################################################################
 
-qt_add_tool(qcollectiongenerator
+qt_get_tool_target_name(target_name qcollectiongenerator)
+qt_add_tool(${target_name}
+    TARGET_DESCRIPTION "Qt Help Collection File Generator"
     TOOLS_TARGET Tools # special case
     SOURCES
         main.c
diff --git a/src/assistant/qhelpgenerator/.prev_CMakeLists.txt b/src/assistant/qhelpgenerator/.prev_CMakeLists.txt
index a9653d99f..cbf850636 100644
--- a/src/assistant/qhelpgenerator/.prev_CMakeLists.txt
+++ b/src/assistant/qhelpgenerator/.prev_CMakeLists.txt
@@ -4,7 +4,9 @@
 ## qhelpgenerator Tool:
 #####################################################################
 
-qt_add_tool(qhelpgenerator
+qt_get_tool_target_name(target_name qhelpgenerator)
+qt_add_tool(${target_name}
+    TARGET_DESCRIPTION "Qt Compressed Help File Generator"
     SOURCES
         ../shared/collectionconfiguration.cpp ../shared/collectionconfiguration.h
         collectionconfigreader.cpp collectionconfigreader.h
@@ -21,3 +23,4 @@ qt_add_tool(qhelpgenerator
 #### Keys ignored in scope 1:.:.:qhelpgenerator.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "Qt Compressed Help File Generator"
 # QTPLUGIN.platforms = "qminimal"
+# QTPLUGIN.sqldrivers = "qsqlite"
diff --git a/src/assistant/qhelpgenerator/CMakeLists.txt b/src/assistant/qhelpgenerator/CMakeLists.txt
index 5f9afc5c3..540bb762a 100644
--- a/src/assistant/qhelpgenerator/CMakeLists.txt
+++ b/src/assistant/qhelpgenerator/CMakeLists.txt
@@ -4,7 +4,9 @@
 ## qhelpgenerator Tool:
 #####################################################################
 
-qt_add_tool(qhelpgenerator
+qt_get_tool_target_name(target_name qhelpgenerator)
+qt_add_tool(${target_name}
+    TARGET_DESCRIPTION "Qt Compressed Help File Generator"
     TOOLS_TARGET Tools # special case
     SOURCES
         ../shared/collectionconfiguration.cpp ../shared/collectionconfiguration.h
@@ -22,3 +24,4 @@ qt_add_tool(qhelpgenerator
 #### Keys ignored in scope 1:.:.:qhelpgenerator.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "Qt Compressed Help File Generator"
 # QTPLUGIN.platforms = "qminimal"
+# QTPLUGIN.sqldrivers = "qsqlite"