diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 34098434eb3..dd0653fc04a 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -1422,12 +1422,7 @@ function(qt6_extract_metatypes target) message(FATAL_ERROR "Metatype generation requires either the use of AUTOMOC or a manual list of generated json files") endif() - if (CMAKE_BUILD_TYPE AND NOT is_multi_config) - string(TOLOWER ${target}_${CMAKE_BUILD_TYPE} target_lowercase) - else() - string(TOLOWER ${target} target_lowercase) - endif() - + string(TOLOWER ${target} target_lowercase) set(metatypes_file_name "qt6${target_lowercase}_metatypes.json") set(metatypes_file "${target_binary_dir}/meta_types/${metatypes_file_name}") set(metatypes_file_gen "${target_binary_dir}/meta_types/${metatypes_file_name}.gen") diff --git a/tests/auto/cmake/test_qt_extract_metatypes/CMakeLists.txt b/tests/auto/cmake/test_qt_extract_metatypes/CMakeLists.txt index 26944b11921..100e890dc8a 100644 --- a/tests/auto/cmake/test_qt_extract_metatypes/CMakeLists.txt +++ b/tests/auto/cmake/test_qt_extract_metatypes/CMakeLists.txt @@ -13,11 +13,7 @@ get_filename_component(test_project_source_dir "${test_project_source_dir}" REAL get_filename_component(test_project_build_dir "${test_project_build_dir}" REALPATH) get_cmake_property(is_multi_config GENERATOR_IS_MULTI_CONFIG) -if (CMAKE_BUILD_TYPE AND NOT is_multi_config) - string(TOLOWER "qt6metatypetest_${CMAKE_BUILD_TYPE}" metatypes_file_basename) -else() - string(TOLOWER "qt6metatypetest" metatypes_file_basename) -endif() +string(TOLOWER "qt6metatypetest" metatypes_file_basename) set(meta_types_file "${test_project_build_dir}/meta_types/${metatypes_file_basename}_metatypes.json")