From a0054754a896c3bf1e49233cc1ef2bdf59e69bd6 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 10 Aug 2022 15:38:51 +0200 Subject: [PATCH] CMake: Move internal targets to the QtInternalTargets FOLDER Set the FOLDER property on targets that are for internal use only. This only has an effect if USE_FOLDERS is ON and the CMake generator supports folders. Task-number: QTBUG-99808 Change-Id: Ia86aeb328d6e31402047d7132e5e628334593801 Reviewed-by: Fabian Kosmale Reviewed-by: Alexandru Croitor --- src/qml/Qt6QmlMacros.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake index 310083696f..008872feba 100644 --- a/src/qml/Qt6QmlMacros.cmake +++ b/src/qml/Qt6QmlMacros.cmake @@ -2227,6 +2227,7 @@ function(qt6_target_qml_sources target) ${generated_sources_other_scope} ) endif() + _qt_internal_assign_to_internal_targets_folder(${target}_tooling) endif() # Batch all the non-compiled qml sources into a single resource for this @@ -2508,8 +2509,10 @@ function(_qt_internal_qml_type_registration target) ${type_registration_cpp_file} ${plugin_types_file} ) + _qt_internal_assign_to_internal_targets_folder(${target}_qmltyperegistration) if(NOT TARGET all_qmltyperegistrations) add_custom_target(all_qmltyperegistrations) + _qt_internal_assign_to_internal_targets_folder(all_qmltyperegistrations) endif() add_dependencies(all_qmltyperegistrations ${target}_qmltyperegistration) @@ -2709,6 +2712,7 @@ but this file does not exist. Possible reasons include: VERBATIM ) add_custom_target(${target}_qmlimportscan DEPENDS "${imports_file}") + _qt_internal_assign_to_internal_targets_folder(${target}_qmlimportscan) add_dependencies(${target} ${target}_qmlimportscan) else() message(VERBOSE "Running qmlimportscanner for ${target}.")