summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/assistant/.prev_CMakeLists.txt4
-rw-r--r--src/assistant/CMakeLists.txt4
-rw-r--r--src/assistant/assistant.pro5
3 files changed, 10 insertions, 3 deletions
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 \
)