From 6c1e0b50c9eb37bc7eb76529128a297cde0da281 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 31 Jan 2024 09:31:22 +0000 Subject: [PATCH] Revert "CMake: Fix *-metatypes.json creation for non-Ninja generators" This reverts commit ab6950acab5f799e5b3f097a87300e7c1dd1cf04. Reason for revert: It breaks test_qml_app_deployment test in qtdeclarative for iOS and Xcode Pick-to: 6.5 Fixes: QTBUG-121729 Task-number: QTBUG-120317 Change-Id: I356882a97f63534aa17133a4fbbb1db90295dfba Reviewed-by: Jani Heikkinen (cherry picked from commit 6aed870919feb565955d6d40e23337d98ff10e7a) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit d0da8d963d31f75b8648448f74819ee0854a86bb) --- src/corelib/Qt6CoreMacros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index bfecc943cb7..08c5cc57a7b 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -1169,7 +1169,7 @@ function(qt6_extract_metatypes target) VERBATIM ) - if(NOT CMAKE_GENERATOR MATCHES "^Ninja") + if(CMAKE_GENERATOR MATCHES " Makefiles") # Work around https://gitlab.kitware.com/cmake/cmake/-/issues/19005 to trigger the command # that generates ${metatypes_file}. add_custom_command(