diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-06 17:45:22 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-02-10 17:56:03 +0000 |
| commit | 9bb781de6f043e0a8a4f8a4f9235d5781b31993d (patch) | |
| tree | 0b08d61360c46d6b565d5661c2cb01a0e83d9a4e | |
| parent | b80788b41baa1bcbf1c09a09056988f768161513 (diff) | |
| download | qt3d-9bb781de6f043e0a8a4f8a4f9235d5781b31993d.tar.gz | |
Add some exclusions for CMake Unity (Jumbo) builds
QtGui headers referencing QTransform clash with source files
using namespace Qt3DCore.
Task-number: QTBUG-109394
Change-Id: I17a4571ef4a69e1133b96442c309cd1f5f922a0c
Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
Reviewed-by: Mike Krus <mike.krus@kdab.com>
(cherry picked from commit d0b49441d348b60a87f845b2ad14a696021f605b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/animation/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/extras/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/plugins/renderers/opengl/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/plugins/renderers/rhi/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/render/CMakeLists.txt | 3 |
5 files changed, 15 insertions, 0 deletions
diff --git a/src/animation/CMakeLists.txt b/src/animation/CMakeLists.txt index ef1dbd0d2..9e2f99a9b 100644 --- a/src/animation/CMakeLists.txt +++ b/src/animation/CMakeLists.txt @@ -90,5 +90,8 @@ qt_internal_add_module(3DAnimation Qt::3DRenderPrivate ) +# QTransform conflicts +set_target_properties(3DAnimation PROPERTIES UNITY_BUILD OFF) + #### Keys ignored in scope 1:.:.:animation.pro:<TRUE>: # MODULE = "3DAnimation" diff --git a/src/extras/CMakeLists.txt b/src/extras/CMakeLists.txt index f320d3298..7e55cffa9 100644 --- a/src/extras/CMakeLists.txt +++ b/src/extras/CMakeLists.txt @@ -86,6 +86,9 @@ qt_internal_add_module(3DExtras Qt::CorePrivate ) +# QTransform conflicts +set_target_properties(3DExtras PROPERTIES UNITY_BUILD OFF) + # Resources: set(extras_resource_files "shaders/es2/coordinatesystems.inc" diff --git a/src/plugins/renderers/opengl/CMakeLists.txt b/src/plugins/renderers/opengl/CMakeLists.txt index 9e1ccc329..82328d1f9 100644 --- a/src/plugins/renderers/opengl/CMakeLists.txt +++ b/src/plugins/renderers/opengl/CMakeLists.txt @@ -121,6 +121,9 @@ qt_internal_add_plugin(OpenGLRendererPlugin Qt::OpenGLPrivate ) +# QTransform conflicts +set_target_properties(OpenGLRendererPlugin PROPERTIES UNITY_BUILD OFF) + qt_internal_extend_target(OpenGLRendererPlugin CONDITION NOT INTEGRITY SOURCES debug/imguirenderer.cpp debug/imguirenderer_p.h diff --git a/src/plugins/renderers/rhi/CMakeLists.txt b/src/plugins/renderers/rhi/CMakeLists.txt index 4e7febe57..9e5e4383f 100644 --- a/src/plugins/renderers/rhi/CMakeLists.txt +++ b/src/plugins/renderers/rhi/CMakeLists.txt @@ -95,6 +95,9 @@ qt_internal_add_plugin(RhiRendererPlugin Qt::ShaderToolsPrivate ) +# QTransform conflicts +set_target_properties(RhiRendererPlugin PROPERTIES UNITY_BUILD OFF) + #### Keys ignored in scope 1:.:.:rhi.pro:<TRUE>: # DISTFILES = "rhirenderer.json" diff --git a/src/render/CMakeLists.txt b/src/render/CMakeLists.txt index 8897bb409..93b5e7a0a 100644 --- a/src/render/CMakeLists.txt +++ b/src/render/CMakeLists.txt @@ -312,6 +312,9 @@ qt_internal_add_module(3DRender Qt::3DCorePrivate ) +# QTransform conflicts +set_target_properties(3DRender PROPERTIES UNITY_BUILD OFF) + # Resources: set(materialsystem_resource_files "materialsystem/prototypes/default.json" |