summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2023-02-13 17:28:52 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-02-15 14:45:16 +0000
commitc3bf94afce42dbef71107df8068e21e6833705da (patch)
tree33d68083f6df88f8b662b5ef680446217601cda5
parenta7992c9b8fc86007c10bb1a3ec381275236f6ac5 (diff)
downloadqtmultimedia-c3bf94afce42dbef71107df8068e21e6833705da.tar.gz
Add some exclusions for CMake Unity (Jumbo) builds
Task-number: QTBUG-109394 Change-Id: I60a6ae76db8e9d2a217075af26cc4de7de908f57 Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 75352dddfef34ead3cd4d19ed9f958a22ef75ca1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/plugins/multimedia/ffmpeg/CMakeLists.txt3
-rw-r--r--src/plugins/multimedia/gstreamer/CMakeLists.txt3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/multimedia/ffmpeg/CMakeLists.txt b/src/plugins/multimedia/ffmpeg/CMakeLists.txt
index 102eb4ab1..f27e876fc 100644
--- a/src/plugins/multimedia/ffmpeg/CMakeLists.txt
+++ b/src/plugins/multimedia/ffmpeg/CMakeLists.txt
@@ -122,6 +122,9 @@ qt_internal_extend_target(QFFmpegMediaPlugin CONDITION QT_FEATURE_xlib
Xext
)
+set_source_files_properties(qx11screencapture.cpp # X headers
+ PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)
+
qt_internal_extend_target(QFFmpegMediaPlugin CONDITION QT_FEATURE_linux_v4l
SOURCES
qv4l2camera.cpp qv4l2camera_p.h
diff --git a/src/plugins/multimedia/gstreamer/CMakeLists.txt b/src/plugins/multimedia/gstreamer/CMakeLists.txt
index 4e940df58..b2ebd4cef 100644
--- a/src/plugins/multimedia/gstreamer/CMakeLists.txt
+++ b/src/plugins/multimedia/gstreamer/CMakeLists.txt
@@ -47,6 +47,9 @@ qt_internal_add_plugin(QGstreamerMediaPlugin
GStreamer::App
)
+set_source_files_properties(common/qgstreamervideosink.cpp # X headers
+ PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)
+
qt_internal_extend_target(QGstreamerMediaPlugin CONDITION QT_FEATURE_gstreamer_photography
LIBRARIES
-lgstphotography-1.0