summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2021-12-14 18:22:23 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-12-16 10:01:00 +0000
commit751d91a5ff4be6f515f69b28f9aed5752c49045b (patch)
treeb09a04595e713a642d4372821fd05431c6d75afb
parent52bc58b865e1ecc36bc889d1d0f97fd253a3d6a6 (diff)
Switch examples to build as isolated sub-builds
Task-number: QTBUG-90820 Change-Id: I8539fee3ea7311acf9ee4e736fb19e6ff595fcae Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 6f75de32c2a8b8ac81ef40489fa9f64ec0435087) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--examples/pdf/CMakeLists.txt4
-rw-r--r--examples/pdfwidgets/CMakeLists.txt2
-rw-r--r--examples/webenginequick/CMakeLists.txt12
-rw-r--r--examples/webenginewidgets/CMakeLists.txt26
4 files changed, 22 insertions, 22 deletions
diff --git a/examples/pdf/CMakeLists.txt b/examples/pdf/CMakeLists.txt
index cca6c03db..265d2ab8f 100644
--- a/examples/pdf/CMakeLists.txt
+++ b/examples/pdf/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_subdirectory(pdfviewer)
-add_subdirectory(multipage)
+qt_internal_add_example(pdfviewer)
+qt_internal_add_example(multipage)
if(NOT TARGET Qt::Svg)
message(WARNING "QtSvg is required as runtime dependency for qtpdfquick examples.")
endif()
diff --git a/examples/pdfwidgets/CMakeLists.txt b/examples/pdfwidgets/CMakeLists.txt
index 37496ebe3..dbde7f1c2 100644
--- a/examples/pdfwidgets/CMakeLists.txt
+++ b/examples/pdfwidgets/CMakeLists.txt
@@ -1 +1 @@
-add_subdirectory(pdfviewer)
+qt_internal_add_example(pdfviewer)
diff --git a/examples/webenginequick/CMakeLists.txt b/examples/webenginequick/CMakeLists.txt
index b08d03980..8105b6c9a 100644
--- a/examples/webenginequick/CMakeLists.txt
+++ b/examples/webenginequick/CMakeLists.txt
@@ -1,8 +1,8 @@
-add_subdirectory(customdialogs)
-add_subdirectory(lifecycle)
-add_subdirectory(minimal)
-add_subdirectory(quicknanobrowser)
-add_subdirectory(webengineaction)
+qt_internal_add_example(customdialogs)
+qt_internal_add_example(lifecycle)
+qt_internal_add_example(minimal)
+qt_internal_add_example(quicknanobrowser)
+qt_internal_add_example(webengineaction)
if(TARGET Qt::QuickControls2)
- add_subdirectory(recipebrowser)
+ qt_internal_add_example(recipebrowser)
endif()
diff --git a/examples/webenginewidgets/CMakeLists.txt b/examples/webenginewidgets/CMakeLists.txt
index a0dc6330d..d9b12607f 100644
--- a/examples/webenginewidgets/CMakeLists.txt
+++ b/examples/webenginewidgets/CMakeLists.txt
@@ -1,22 +1,22 @@
-add_subdirectory(minimal)
-add_subdirectory(contentmanipulation)
-add_subdirectory(cookiebrowser)
-add_subdirectory(notifications)
-add_subdirectory(simplebrowser)
-add_subdirectory(stylesheetbrowser)
-add_subdirectory(videoplayer)
-add_subdirectory(webui)
+qt_internal_add_example(minimal)
+qt_internal_add_example(contentmanipulation)
+qt_internal_add_example(cookiebrowser)
+qt_internal_add_example(notifications)
+qt_internal_add_example(simplebrowser)
+qt_internal_add_example(stylesheetbrowser)
+qt_internal_add_example(videoplayer)
+qt_internal_add_example(webui)
if(QT_FEATURE_webengine_geolocation)
- add_subdirectory(maps)
+ qt_internal_add_example(maps)
endif()
if(QT_FEATURE_webengine_webchannel)
- add_subdirectory(markdowneditor)
+ qt_internal_add_example(markdowneditor)
endif()
if(QT_FEATURE_webengine_printing_and_pdf)
- add_subdirectory(printme)
- add_subdirectory(html2pdf)
+ qt_internal_add_example(printme)
+ qt_internal_add_example(html2pdf)
endif()
if(QT_FEATURE_webengine_spellchecker AND NOT CMAKE_CROSSCOMPILING
AND NOT QT_FEATURE_webengine_native_spellchecker AND NOT WIN32)
- add_subdirectory(spellchecker)
+ qt_internal_add_example(spellchecker)
endif()