summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2023-02-08 11:58:11 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-02-15 14:17:31 +0000
commit47e065c6cfda2e2c394397c813c1205ce3756ddf (patch)
treef702554b6457f3fbfacad59f818ae284ce4327ef
parent235d3a73d10afcfed928f24151849388a7139f5c (diff)
Add some exclusions for CMake Unity (Jumbo) builds
Task-number: QTBUG-109394 Change-Id: I11c1f93360bc07980636b32c65e7b99095e4f2d9 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 1feefed0e4a19cd1430ea840be63ef40cb855496) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/activeqt/container/CMakeLists.txt4
-rw-r--r--src/activeqt/control/CMakeLists.txt4
2 files changed, 8 insertions, 0 deletions
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:
#####################################################################