1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QtDBus: Fix unity build on Windows

Browse Source 
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 <alexandru.croitor@qt.io>
(cherry picked from commit fcab2b88af61e7987ea962f520862cf470cd8c30)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Friedemann Kleint 2023-11-01 10:28:45 +01:00 committed by Qt Cherry-pick Bot
parent b799a2107c
commit 0dc1dac296
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dbus/CMakeLists.txt
View File

@ -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