diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2020-11-23 08:21:51 +0000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-11-23 08:53:59 +0000 |
| commit | 2ec586f49d749217d9d34fdf4ea3fd783c153dc0 (patch) | |
| tree | e9d0920cd415b7a13a30f12da0e06b3558176ef4 /src | |
| parent | a45bf06ff7190b5ea6daaf58d709341f5aa1dd8d (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/assistant/.prev_CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/assistant/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/assistant/assistant.pro | 5 |
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 \ ) |