diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2021-08-30 17:41:27 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2021-08-31 09:44:10 +0200 |
| commit | faa74f9b402f6b5d78acdb71b05ca340684b3591 (patch) | |
| tree | bf7c43f90de208e6ec9103b5daa9e0fa7f62d66b /examples | |
| parent | eb06977c7a8d4afb4b15e02f818dd658c04d1cc8 (diff) | |
Simplify test examples target includes
Fix condition to include examples and tests based
on targets. We are no longer behind external project
so we can simply check for targets.
Fix issue for including automoc call when running qt
configure when doing top level build.
Pick-to: 6.2
Task-number: QTBUG-95590
Change-Id: I0cd2d8016e14ddf296455277e968b43a923a7217
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 54e8d5006..e17626721 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -2,16 +2,16 @@ cmake_minimum_required(VERSION 3.16) qt_examples_build_begin() if(NOT CMAKE_CROSSCOMPILING) #QTBUG-86533 - if(QT_FEATURE_qtwebengine_build AND QT_FEATURE_qtwebengine_quick_build) + if(TARGET Qt::WebEngineCore) add_subdirectory(webengine) endif() - if(QT_FEATURE_qtwebengine_build AND QT_FEATURE_qtwebengine_widgets_build) + if(TARGET Qt::WebEngineWidgets) add_subdirectory(webenginewidgets) endif() - if(QT_FEATURE_qtpdf_build AND QT_FEATURE_qtpdf_quick_build) + if(TARGET Qt::Pdf) add_subdirectory(pdf) endif() - if(QT_FEATURE_qtpdf_build AND QT_FEATURE_qtpdf_widgets_build) + if(TARGET Qt::PdfWidgets) add_subdirectory(pdfwidgets) endif() endif() |