From c19504e708bf099922180ab99f3cf4b94d91fc7e Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Wed, 29 Mar 2023 11:52:21 +0200 Subject: [PATCH] Clean up NO_UNITY_BUILD instruction We can now use NO_UNITY_BUILD_SOURCES instead, and we only need to exclude one of the file to avoid the exclusion. Task-number: QTBUG-109394 Pick-to: 6.5 Change-Id: I33642eece77e362f8a1de7400c14a30da7889239 Reviewed-by: Alexandru Croitor --- src/plugins/platforms/direct2d/CMakeLists.txt | 1 - src/plugins/platforms/windows/CMakeLists.txt | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/plugins/platforms/direct2d/CMakeLists.txt b/src/plugins/platforms/direct2d/CMakeLists.txt index 4cbc7ac986..3d41023bfd 100644 --- a/src/plugins/platforms/direct2d/CMakeLists.txt +++ b/src/plugins/platforms/direct2d/CMakeLists.txt @@ -47,7 +47,6 @@ qt_internal_add_plugin(QWindowsDirect2DIntegrationPlugin qwindowsdirect2dwindow.cpp qwindowsdirect2dwindow.h NO_UNITY_BUILD_SOURCES ../windows/qwindowspointerhandler.cpp - ../windows/qwindowsmousehandler.cpp DEFINES QT_NO_CAST_FROM_ASCII QT_NO_FOREACH diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt index 4425e78b30..abbcebfcfc 100644 --- a/src/plugins/platforms/windows/CMakeLists.txt +++ b/src/plugins/platforms/windows/CMakeLists.txt @@ -38,6 +38,8 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin qwindowstheme.cpp qwindowstheme.h qwindowsthreadpoolrunner.h qwindowswindow.cpp qwindowswindow.h + NO_UNITY_BUILD_SOURCES + qwindowspointerhandler.cpp DEFINES QT_NO_CAST_FROM_ASCII QT_NO_FOREACH @@ -66,10 +68,6 @@ 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"