1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "CMake: Fix *-metatypes.json creation for non-Ninja generators"

Browse Source 
This reverts commit ab6950acab5f799e5b3f097a87300e7c1dd1cf04.

Reason for revert: It breaks test_qml_app_deployment test in qtdeclarative for iOS and Xcode

Pick-to: 6.5 6.6 dev
Fixes: QTBUG-121729
Task-number: QTBUG-120317
Change-Id: I356882a97f63534aa17133a4fbbb1db90295dfba
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
This commit is contained in:
Alexandru Croitor 2024-01-31 09:31:22 +00:00
parent 4518717dec
commit 6aed870919
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/Qt6CoreMacros.cmake
View File

@ -1371,7 +1371,7 @@ function(qt6_extract_metatypes target)
VERBATIM 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 # Work around https://gitlab.kitware.com/cmake/cmake/-/issues/19005 to trigger the command
# that generates ${metatypes_file}. # that generates ${metatypes_file}.
add_custom_command( add_custom_command(