From 0dc1dac29630de568a50371084aed70b54f1b97a Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 1 Nov 2023 10:28:45 +0100 Subject: [PATCH] QtDBus: Fix unity build on Windows Exclude qdbusconnectionmanager.cpp which includes qt_windows.h, clashing with the "interface" parameter name in qdbusinterface.h. Task-number: QTBUG-115352 Pick-to: 6.5 Change-Id: Id41910857cb203ec5a1b784fa171eeb189ca4eca Reviewed-by: Alexandru Croitor (cherry picked from commit fcab2b88af61e7987ea962f520862cf470cd8c30) Reviewed-by: Qt Cherry-pick Bot --- src/dbus/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt index f489eac2e37..57dbc3f3480 100644 --- a/src/dbus/CMakeLists.txt +++ b/src/dbus/CMakeLists.txt @@ -40,6 +40,8 @@ qt_internal_add_module(DBus qdbusxmlgenerator.cpp qdbusxmlparser.cpp qdbusxmlparser_p.h qtdbusglobal.h qtdbusglobal_p.h + NO_UNITY_BUILD_SOURCES + qdbusconnectionmanager.cpp # qt_windows.h clashing with "interface" DEFINES DBUS_API_SUBJECT_TO_CHANGE QT_NO_FOREACH