From 1feefed0e4a19cd1430ea840be63ef40cb855496 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 8 Feb 2023 11:58:11 +0100 Subject: Add some exclusions for CMake Unity (Jumbo) builds Pick-to: 6.5 Task-number: QTBUG-109394 Change-Id: I11c1f93360bc07980636b32c65e7b99095e4f2d9 Reviewed-by: Oliver Wolff Reviewed-by: Joerg Bornemann --- src/activeqt/container/CMakeLists.txt | 4 ++++ src/activeqt/control/CMakeLists.txt | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/activeqt/container/CMakeLists.txt b/src/activeqt/container/CMakeLists.txt index 474393a..a513aea 100644 --- a/src/activeqt/container/CMakeLists.txt +++ b/src/activeqt/container/CMakeLists.txt @@ -31,3 +31,7 @@ qt_internal_add_module(AxContainer ENABLE_AUTOGEN_TOOLS uic ) + +set_source_files_properties(qaxbase.cpp # defines QT_CHECK_STATE + qaxscriptwrapper.cpp # references qAxFactory() + PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON) diff --git a/src/activeqt/control/CMakeLists.txt b/src/activeqt/control/CMakeLists.txt index 0cb3d4c..e4e5b92 100644 --- a/src/activeqt/control/CMakeLists.txt +++ b/src/activeqt/control/CMakeLists.txt @@ -35,6 +35,10 @@ qt_internal_add_module(AxServer shell32 ) +set_source_files_properties(qaxservermain.cpp # define main() + qaxmain.cpp + PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON) + ## Scopes: ##################################################################### -- cgit v1.2.1