summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Blechmann <[email protected]>2025-05-15 10:19:15 +0200
committerTim Blechmann <[email protected]>2025-06-03 13:21:51 +0000
commitbc822b5d8e732e328ab94570f7acdca4bc0ee6b5 (patch)
tree2ec1c6113ad07de385daf20dbda652fd37c517c2
parent9b98db31780b3225c55470cd2376e54f05dd7224 (diff)
Build system: skip qtmultimedia if threading is disabledHEADdev
It allows us to use QPromise/QFuture inside QtMultimedia. [ChangeLog] QtMultimedia now requires Qt to be compiled with FEATURE_thread. This implies it is not available in single-threaded webassembly Pick-to: 6.10 Task-number: QTBUG-129465 Task-number: QTBUG-137351 Change-Id: Iecb7c296072f0452ce29a84e220294c4f76d359e Reviewed-by: Morten Johan Sørvig <[email protected]>
-rw-r--r--CMakeLists.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 047e0f088..b77e060e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,6 +32,11 @@ if(QNX AND CMAKE_SYSTEM_VERSION GREATER_EQUAL 800)
return()
endif()
+if(NOT QT_FEATURE_thread)
+ message(NOTICE "Skipping the build of QtMultimedia as it is not supported without threads")
+ return()
+endif()
+
include(src/multimedia/Qt6MultimediaMacros.cmake)
set(QT_BUILD_EXTRA_IDE_FILE_PATTERNS