diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2020-11-23 08:21:51 +0000 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2020-11-23 09:35:08 +0100 |
| commit | 2a41769b64c166b5a93d1046e030fe22dc0834eb (patch) | |
| tree | 70ade24453733607ee8ec6ede3dfa556380203d3 /examples | |
| parent | 6ea90064cb46470f8f5e3f12e1337ca4af4ee304 (diff) | |
Revert "Exclude assistant from build"
This reverts commit 7aeec24a9b8c00ee56891e4037406eca8271aa4d.
Reason for revert: See discussion in QTBUG-86746
Pick-to: 6.0.0 6.0
Change-Id: I9e9cc95513a1b9b3685b10b262ae2ee7334caf69
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | examples/examples.pro | 8 |
2 files changed, 12 insertions, 2 deletions
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 \ +) |