summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/animation/CMakeLists.txt3
-rw-r--r--src/extras/CMakeLists.txt3
-rw-r--r--src/plugins/renderers/opengl/CMakeLists.txt3
-rw-r--r--src/plugins/renderers/rhi/CMakeLists.txt3
-rw-r--r--src/render/CMakeLists.txt3
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"