From ed4d2917ae5a391ab1a4b6a98d75eae90fa37f32 Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Wed, 29 Mar 2023 12:05:21 +0200 Subject: [PATCH] Use NO_PCH_SOURCES to exclude files We should be able to just use NO_PCH_SOURCES under MINGW condition and get the same result. P.S. The problem with `qwindowspointerhandler.cpp`, most likely caused due to symbol collision with `qwindowsmousehandler.cpp`. We've encountered it again when we were building with unity. Pick-to: 6.5 Change-Id: I20a5091d5d1a329228b5ddb4694f5fd61d803554 Reviewed-by: Joerg Bornemann --- src/plugins/platforms/direct2d/CMakeLists.txt | 5 ++--- src/plugins/platforms/windows/CMakeLists.txt | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/plugins/platforms/direct2d/CMakeLists.txt b/src/plugins/platforms/direct2d/CMakeLists.txt index 3d41023bfd..20c19929be 100644 --- a/src/plugins/platforms/direct2d/CMakeLists.txt +++ b/src/plugins/platforms/direct2d/CMakeLists.txt @@ -107,6 +107,8 @@ qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION QT_FEATURE qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION MINGW LIBRARIES uuid + NO_PCH_SOURCES + ../windows/qwindowspointerhandler.cpp ) qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION QT_FEATURE_opengl @@ -211,6 +213,3 @@ qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION MINGW AND uuid ) -if (MINGW) - set_source_files_properties(../windows/qwindowspointerhandler.cpp PROPERTIES SKIP_PRECOMPILE_HEADERS ON) -endif() diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt index abbcebfcfc..333b7d67f1 100644 --- a/src/plugins/platforms/windows/CMakeLists.txt +++ b/src/plugins/platforms/windows/CMakeLists.txt @@ -102,6 +102,8 @@ qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION MINGW LIBRARIES uuid + NO_PCH_SOURCES + qwindowspointerhandler.cpp ) qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_systemtrayicon @@ -197,7 +199,3 @@ qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION MINGW AND QT_FEATU LIBRARIES uuid ) - -if (MINGW) - set_source_files_properties(qwindowspointerhandler.cpp PROPERTIES SKIP_PRECOMPILE_HEADERS ON) -endif()