Skip to content

Commit

Permalink
Revert "CMake: Fix *-metatypes.json creation for non-Ninja generators"
Browse files Browse the repository at this point in the history
This reverts commit ab6950a.

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 <jani.heikkinen@qt.io>
(cherry picked from commit 6aed870)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit d0da8d9)
  • Loading branch information
alcroito authored and Qt Cherry-pick Bot committed Feb 2, 2024
1 parent 100f1aa commit 6c1e0b5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/corelib/Qt6CoreMacros.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down

0 comments on commit 6c1e0b5

Please sign in to comment.