diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-11-01 10:28:45 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-11-01 21:05:38 +0100 |
| commit | fcab2b88af61e7987ea962f520862cf470cd8c30 (patch) | |
| tree | 03ca2a35f4d62f78617b37bd03fd3bd723ee7ab2 | |
| parent | f5a5c59918021b0bf9a43e6130df2a3f02ea5b97 (diff) | |
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.6 6.5
Change-Id: Id41910857cb203ec5a1b784fa171eeb189ca4eca
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | src/dbus/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt index 1c69fa51b2..fb1e9f9cae 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_CONTEXTLESS_CONNECT |