diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-27 11:26:22 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-16 16:03:06 +0100 |
| commit | 64dc6fe87d05aaad3ce516747ad6dbd048f388cb (patch) | |
| tree | b92970ae773c3553b8e3dcb6f8470689f909e75a /src/plugins/platforms | |
| parent | 557dcd8a87c6c6c77ccc71a85b1ec349c69eb4c4 (diff) | |
Add some exclusions for CMake Unity (Jumbo) builds
Add exclusions for issues that are likely not fixable
(3rd party code, X11 define clashes, etc) in 3rd party,
tools and plugins.
Pick-to: 6.5
Task-number: QTBUG-109394
Done-with: Amir Masoud Abdol <amir.abdol@qt.io>
Change-Id: I698c004201a76a48389271c130e44fba20f5adf7
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/plugins/platforms')
5 files changed, 12 insertions, 0 deletions
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt index 21699aab27..5e91d67ccd 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt @@ -25,3 +25,5 @@ qt_internal_add_plugin(QEglFSX11IntegrationPlugin X11::XCB XCB::XCB ) + +set_target_properties(QEglFSX11IntegrationPlugin PROPERTIES UNITY_BUILD OFF) # X11 define clashes diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt index 33ccbf6a0a..4425e78b30 100644 --- a/src/plugins/platforms/windows/CMakeLists.txt +++ b/src/plugins/platforms/windows/CMakeLists.txt @@ -66,6 +66,10 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin runtimeobject ) +# Duplicated symbols +set_source_files_properties(qwindowspointerhandler.cpp qwindowsmousehandler.cpp + PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON) + # Resources: set_source_files_properties("openglblacklists/default.json" PROPERTIES QT_RESOURCE_ALIAS "default.json" diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt index 3303f19487..4f019dde5a 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -62,6 +62,8 @@ qt_internal_add_module(XcbQpaPrivate XKB::XKB ) +set_target_properties(XcbQpaPrivate PROPERTIES UNITY_BUILD OFF) # X11 define clashes + qt_disable_apple_app_extension_api_only(XcbQpaPrivate) ## Scopes: diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt index c67ccd1cb1..98ea3c9e43 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt @@ -29,3 +29,5 @@ qt_internal_add_plugin(QXcbEglIntegrationPlugin Qt::XcbQpaPrivate EGL::EGL ) + +set_target_properties(QXcbEglIntegrationPlugin PROPERTIES UNITY_BUILD OFF) # X11 define clashes diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt index 13787eb9e7..a7fdbe0b98 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt @@ -27,6 +27,8 @@ qt_internal_add_plugin(QXcbGlxIntegrationPlugin Qt::XcbQpaPrivate ) +set_target_properties(QXcbGlxIntegrationPlugin PROPERTIES UNITY_BUILD OFF) # X11 define clashes + ## Scopes: ##################################################################### |