diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-04-25 09:31:29 +0200 |
|---|---|---|
| committer | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-04-25 16:54:12 +0200 |
| commit | 3c2ea40bbe5327ce6a56dcef64ff3a8fb263705c (patch) | |
| tree | 9b9d5bea81e234c9a55c798657b551cbeef9984b | |
| parent | b1221e421459d261f67e03bb40c8ce36e95f0704 (diff) | |
| download | qtmultimedia-3c2ea40bbe5327ce6a56dcef64ff3a8fb263705c.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.
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: Ided106a6b07f4a2d8c85419f86a5220f4cb77a23
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -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 |