diff options
author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-04-25 09:31:29 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-04-25 20:08:16 +0000 |
commit | 4cf3e7fb7a87d6f9117f4bcde4b0816ca5369e67 (patch) | |
tree | cdc503a1f374ba4a694ce705de4a05d5bba493fc | |
parent | 3494d979bf93b81161dfa22e5622f0b702b6c1ad (diff) | |
download | qtmultimedia-4cf3e7fb7a87d6f9117f4bcde4b0816ca5369e67.tar.gz |
Exclude files including EGL/egl.h from Unity Build
It seems that when <EGL/egl.h> is included, we get conflicting symbols
between QUrl, and X11 symbols.
Task-number: QTBUG-109394
Change-Id: Ided106a6b07f4a2d8c85419f86a5220f4cb77a23
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 3c2ea40bbe5327ce6a56dcef64ff3a8fb263705c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/plugins/multimedia/ffmpeg/CMakeLists.txt | 3 | ||||
-rw-r--r-- | src/plugins/multimedia/gstreamer/CMakeLists.txt | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/plugins/multimedia/ffmpeg/CMakeLists.txt b/src/plugins/multimedia/ffmpeg/CMakeLists.txt index 49775aa42..52c16306b 100644 --- a/src/plugins/multimedia/ffmpeg/CMakeLists.txt +++ b/src/plugins/multimedia/ffmpeg/CMakeLists.txt @@ -64,6 +64,9 @@ qt_internal_add_plugin(QFFmpegMediaPlugin qt_internal_extend_target(QFFmpegMediaPlugin CONDITION QT_FEATURE_ffmpeg AND QT_FEATURE_vaapi SOURCES qffmpeghwaccel_vaapi.cpp qffmpeghwaccel_vaapi_p.h + NO_UNITY_BUILD_SOURCES + # Conflicts with macros defined in X11.h, and Xlib.h + qffmpeghwaccel_vaapi.cpp LIBRARIES VAAPI::VAAPI EGL::EGL diff --git a/src/plugins/multimedia/gstreamer/CMakeLists.txt b/src/plugins/multimedia/gstreamer/CMakeLists.txt index b2ebd4cef..96b9d3a22 100644 --- a/src/plugins/multimedia/gstreamer/CMakeLists.txt +++ b/src/plugins/multimedia/gstreamer/CMakeLists.txt @@ -34,6 +34,10 @@ qt_internal_add_plugin(QGstreamerMediaPlugin mediacapture/qgstreamerimagecapture.cpp mediacapture/qgstreamerimagecapture_p.h mediacapture/qgstreamermediacapture.cpp mediacapture/qgstreamermediacapture_p.h mediacapture/qgstreamermediaencoder.cpp mediacapture/qgstreamermediaencoder_p.h + NO_UNITY_BUILD_SOURCES + # Conflicts with macros defined in X11.h, and Xlib.h + common/qgstvideobuffer.cpp + common/qgstreamervideosink.cpp DEFINES GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26 INCLUDE_DIRECTORIES @@ -47,9 +51,6 @@ 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 |