summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2022-07-01 11:47:24 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2022-07-06 14:56:19 +0200
commit2a387a1b3d160a4b287a6a521961f20a046ba6e7 (patch)
treed8f831849f3367c9dc56b50b13292d8f5a9ead6a
parenta474d736e81aaba618bb9d3f1c918109f28915ca (diff)
qt6_add_statecharts: Skip AUTOGEN for generated .h files too
The generated .cpp files already contain everything that moc would've generated. Fixes: QTBUG-98368 Pick-to: 6.2 6.3 6.4 Change-Id: I802399c6fb4f89b905a2b23833bcd6955d2387a8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--src/scxml/Qt6ScxmlMacros.cmake6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/scxml/Qt6ScxmlMacros.cmake b/src/scxml/Qt6ScxmlMacros.cmake
index 0cd9797..d846dfc 100644
--- a/src/scxml/Qt6ScxmlMacros.cmake
+++ b/src/scxml/Qt6ScxmlMacros.cmake
@@ -1,4 +1,5 @@
# Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB).
+# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
function(qt6_add_statecharts target_or_outfiles)
@@ -53,12 +54,9 @@ function(qt6_add_statecharts target_or_outfiles)
DEPENDS ${QT_CMAKE_EXPORT_NAMESPACE}::qscxmlc
MAIN_DEPENDENCY ${infile}
VERBATIM)
+ set_source_files_properties(${outfile_cpp} ${outfile_h} PROPERTIES SKIP_AUTOGEN TRUE)
list(APPEND outfiles ${outfile_cpp})
endforeach()
- set_source_files_properties(${outfiles} PROPERTIES
- SKIP_AUTOMOC TRUE
- SKIP_AUTOUIC TRUE
- )
if (TARGET ${target_or_outfiles})
target_include_directories(${target_or_outfiles} PRIVATE ${qscxmlcOutputDir})
target_sources(${target_or_outfiles} PRIVATE ${outfiles})