diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-04-25 09:28:35 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-04-25 19:11:17 +0000 |
| commit | 7f7b6fc0b41a3f49d749000515e51154ceb5ccc1 (patch) | |
| tree | c12a8fb5fd75679ac95702861fb4952a8c043581 | |
| parent | 8a50838018c27893d2b9edf2496869488948ed03 (diff) | |
Exclude hardwareintegration plugins 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: I6a4d6c475d43d0f8f35a27b855a69cf6f842742a
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit a101e63bc0d97232b60fba0e2f52e59499210fa0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/plugins/hardwareintegration/CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/hardwareintegration/CMakeLists.txt b/src/plugins/hardwareintegration/CMakeLists.txt index 949243d81..472a4f909 100644 --- a/src/plugins/hardwareintegration/CMakeLists.txt +++ b/src/plugins/hardwareintegration/CMakeLists.txt @@ -3,9 +3,15 @@ # Generated from hardwareintegration.pro. +# When doing unity build, we get symbol collisions with macros defined +# in X11.h, and Xlib.h +set(CMAKE_UNITY_BUILD OFF) + if(TARGET Qt::WaylandClient) add_subdirectory(client) endif() if(TARGET Qt::WaylandCompositor) add_subdirectory(compositor) endif() + +set(CMAKE_UNITY_BUILD ${QT_UNITY_BUILD}) |