11 files changed, 8 insertions, 23 deletions
diff --git a/src/3rdparty/freetype/CMakeLists.txt b/src/3rdparty/freetype/CMakeLists.txt
index ac7fb8480b..720a98bee1 100644
--- a/src/3rdparty/freetype/CMakeLists.txt
+++ b/src/3rdparty/freetype/CMakeLists.txt
@@ -73,8 +73,6 @@ qt_internal_add_3rdparty_library(BundledFreetype
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
 )
 
-set_target_properties(BundledFreetype PROPERTIES UNITY_BUILD OFF)
-
 qt_internal_add_3rdparty_header_module(FreetypePrivate
     EXTERNAL_HEADERS_DIR include
 )
diff --git a/src/3rdparty/harfbuzz-ng/CMakeLists.txt b/src/3rdparty/harfbuzz-ng/CMakeLists.txt
index 1940da9b2b..c761bda388 100644
--- a/src/3rdparty/harfbuzz-ng/CMakeLists.txt
+++ b/src/3rdparty/harfbuzz-ng/CMakeLists.txt
@@ -76,8 +76,6 @@ qt_internal_add_3rdparty_library(BundledHarfbuzz
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/harfbuzz>
 )
 
-set_target_properties(BundledHarfbuzz PROPERTIES UNITY_BUILD OFF)
-
 qt_internal_add_sync_header_dependencies(BundledHarfbuzz Core)
 
 # GHS compiler doesn't support the __restrict keyword
diff --git a/src/3rdparty/libjpeg/CMakeLists.txt b/src/3rdparty/libjpeg/CMakeLists.txt
index 13e54119be..d1da6c6849 100644
--- a/src/3rdparty/libjpeg/CMakeLists.txt
+++ b/src/3rdparty/libjpeg/CMakeLists.txt
@@ -60,8 +60,6 @@ qt_internal_add_3rdparty_library(BundledLibjpeg
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
 )
 
-set_target_properties(BundledLibjpeg PROPERTIES UNITY_BUILD OFF)
-
 qt_internal_add_3rdparty_header_module(JpegPrivate
     EXTERNAL_HEADERS
         src/jpeglib.h
diff --git a/src/3rdparty/zlib/CMakeLists.txt b/src/3rdparty/zlib/CMakeLists.txt
index 81fc649538..ee9ece80fc 100644
--- a/src/3rdparty/zlib/CMakeLists.txt
+++ b/src/3rdparty/zlib/CMakeLists.txt
@@ -34,8 +34,6 @@ qt_internal_add_3rdparty_library(BundledZLIB
         $<TARGET_PROPERTY:Core,INCLUDE_DIRECTORIES>
 )
 
-set_target_properties(BundledZLIB PROPERTIES UNITY_BUILD OFF)
-
 qt_internal_add_sync_header_dependencies(BundledZLIB Core)
 
 qt_disable_warnings(BundledZLIB)
diff --git a/src/plugins/imageformats/ico/CMakeLists.txt b/src/plugins/imageformats/ico/CMakeLists.txt
index 6417c1d9d4..c9cd0f0d40 100644
--- a/src/plugins/imageformats/ico/CMakeLists.txt
+++ b/src/plugins/imageformats/ico/CMakeLists.txt
@@ -15,6 +15,5 @@ qt_internal_add_plugin(QICOPlugin
         Qt::Core
         Qt::CorePrivate
         Qt::Gui
+    NO_UNITY_BUILD
 )
-
-set_target_properties(QICOPlugin PROPERTIES UNITY_BUILD OFF)
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt
index 5e91d67ccd..9dde3090c8 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt
@@ -24,6 +24,5 @@ qt_internal_add_plugin(QEglFSX11IntegrationPlugin
         X11::X11
         X11::XCB
         XCB::XCB
+    NO_UNITY_BUILD # X11 define clashes
 )
-
-set_target_properties(QEglFSX11IntegrationPlugin PROPERTIES UNITY_BUILD OFF) # X11 define clashes
diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt
index 4f019dde5a..17e723d607 100644
--- a/src/plugins/platforms/xcb/CMakeLists.txt
+++ b/src/plugins/platforms/xcb/CMakeLists.txt
@@ -60,10 +60,9 @@ qt_internal_add_module(XcbQpaPrivate
         # XCB::XINPUT # special case remove handled below
         XCB::XKB
         XKB::XKB
+    NO_UNITY_BUILD # X11 define clashes
 )
 
-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 98ea3c9e43..12938c159a 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt
@@ -28,6 +28,5 @@ qt_internal_add_plugin(QXcbEglIntegrationPlugin
         Qt::GuiPrivate
         Qt::XcbQpaPrivate
         EGL::EGL
+    NO_UNITY_BUILD # X11 define clashes
 )
-
-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 a7fdbe0b98..f9f78ad1eb 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt
@@ -25,10 +25,9 @@ qt_internal_add_plugin(QXcbGlxIntegrationPlugin
         Qt::Gui
         Qt::GuiPrivate
         Qt::XcbQpaPrivate
+    NO_UNITY_BUILD # X11 define clashes
 )
 
-set_target_properties(QXcbGlxIntegrationPlugin PROPERTIES UNITY_BUILD OFF) # X11 define clashes
-
 ## Scopes:
 #####################################################################
 
diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt
index 0919159b59..e065fdf2cb 100644
--- a/src/tools/bootstrap/CMakeLists.txt
+++ b/src/tools/bootstrap/CMakeLists.txt
@@ -108,6 +108,7 @@ qt_internal_extend_target(Bootstrap
         ../../corelib/global
     PUBLIC_LIBRARIES
         Qt::Platform
+    NO_UNITY_BUILD
 )
 
 ## Scopes:
@@ -226,7 +227,7 @@ qt_internal_extend_target(Bootstrap CONDITION MINGW AND WIN32
 
 target_link_libraries(Bootstrap PRIVATE PlatformCommonInternal)
 qt_internal_apply_gc_binaries(Bootstrap PUBLIC)
-set_target_properties(Bootstrap PROPERTIES AUTOMOC OFF AUTOUIC OFF AUTORCC OFF UNITY_BUILD OFF)
+set_target_properties(Bootstrap PROPERTIES AUTOMOC OFF AUTOUIC OFF AUTORCC OFF)
 qt_internal_add_target_aliases(Bootstrap)
 qt_set_msvc_cplusplus_options(Bootstrap PUBLIC)
 qt_set_common_target_properties(Bootstrap)
diff --git a/src/tools/tracegen/CMakeLists.txt b/src/tools/tracegen/CMakeLists.txt
index 42b0cbcf77..f5f6b2e184 100644
--- a/src/tools/tracegen/CMakeLists.txt
+++ b/src/tools/tracegen/CMakeLists.txt
@@ -19,9 +19,6 @@ qt_internal_add_tool(${target_name}
         provider.cpp provider.h
         qtheaders.cpp qtheaders.h
         tracegen.cpp
+    NO_UNITY_BUILD
 )
 qt_internal_return_unless_building_tools()
-
-set_target_properties(${target_name} PROPERTIES
-    UNITY_BUILD OFF
-)