From 7f7b6fc0b41a3f49d749000515e51154ceb5ccc1 Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Tue, 25 Apr 2023 09:28:35 +0200 Subject: Exclude hardwareintegration plugins from Unity Build It seems that when is included, we get conflicting symbols between QUrl, and X11 symbols. Task-number: QTBUG-109394 Change-Id: I6a4d6c475d43d0f8f35a27b855a69cf6f842742a Reviewed-by: Alexey Edelev (cherry picked from commit a101e63bc0d97232b60fba0e2f52e59499210fa0) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/hardwareintegration/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/plugins/hardwareintegration/CMakeLists.txt b/src/plugins/hardwareintegration/CMakeLists.txt index 949243d8..472a4f90 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}) -- cgit v1.2.1