From 7aeec24a9b8c00ee56891e4037406eca8271aa4d Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 5 Nov 2020 11:22:03 +0100 Subject: Exclude assistant from build Task-number: QTBUG-86746 Tash-number: QTBUG-88123 Change-Id: Ia086ab9a7c193e7829ef886929dc921432f67a1b Reviewed-by: Kai Koehne --- examples/CMakeLists.txt | 6 ------ examples/examples.pro | 8 ++------ 2 files changed, 2 insertions(+), 12 deletions(-) (limited to 'examples') 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 -- cgit v1.2.3