summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2023-07-06 19:34:23 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-07-07 08:19:51 +0000
commit76afb99859a018ae422ef756f87185721fe8a653 (patch)
treec13af74c3b7b80c2cc3c560b3036ec8f996ee133
parent028d0c06f20273606e37aa109ce55c5d95da0d4a (diff)
Ensure that WaylandGlobalPrivate_sync_headers is running
Work around QTBUG-115101. Task-number: QTBUG-115101 Change-Id: Icb195e0547b8faafea73d204650a1ee7bede4a7f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 742a00ccaed5ca3a4ad5a791ccd3685c001162c1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/CMakeLists.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c3219f9d2..b2804ea2e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -30,6 +30,15 @@ endif()
# See global/README for a description of the following module.
qt_internal_add_module(WaylandGlobalPrivate INTERNAL_MODULE HEADER_MODULE)
+
+# Work around 115101.
+# If nothing depends on the WaylandGlobalPrivate target it doesn't run custom commands that the
+# target depends on. WaylandGlobalPrivate_ensure_sync_headers makes sure that 'all' depends on
+# WaylandGlobalPrivate_sync_headers.
+# TODO: This needs to be removed once the fix for QTBUG-115101 is merged in qtbase.
+add_custom_target(WaylandGlobalPrivate_ensure_sync_headers ALL)
+add_dependencies(WaylandGlobalPrivate_ensure_sync_headers WaylandGlobalPrivate_sync_headers)
+
add_subdirectory(qtwaylandscanner)
# special case begin