diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake index d81de627607..b5e77c1b686 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake @@ -144,15 +144,6 @@ function(qt_get_direct_module_dependencies target out_var) continue() endif() get_target_property(lib_type ${lib} TYPE) - get_target_property(is_versionless_target ${lib} _qt_is_versionless_target) - if (lib_type STREQUAL "INTERFACE_LIBRARY" AND is_versionless_target) - # Found a version-less target like Qt::Core outside of qtbase. - # Skip this one and use what this target points to, e.g. Qt6::Core. - # Make sure to process Private interface libraries as-is. - get_target_property(ifacelibs ${lib} INTERFACE_LINK_LIBRARIES) - list(PREPEND libs ${ifacelibs}) - continue() - endif() get_target_property(aliased_target ${lib} ALIASED_TARGET) if(TARGET "${aliased_target}") # If versionless target is alias, use what the alias points to. diff --git a/cmake/QtPublicCMakeHelpers.cmake b/cmake/QtPublicCMakeHelpers.cmake index b8a3e6eef95..23ba0c10280 100644 --- a/cmake/QtPublicCMakeHelpers.cmake +++ b/cmake/QtPublicCMakeHelpers.cmake @@ -441,5 +441,7 @@ function(_qt_internal_create_versionless_targets targets install_namespace) ${property} "${exported_property_value}") endif() endforeach() + + set_property(TARGET Qt::${target} PROPERTY _qt_is_versionless_target TRUE) endforeach() endfunction()