From d688c73e083cecc9b9478f09b202b66b92c87e4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 4 Feb 2025 12:07:14 +0100 Subject: [PATCH] cmake: Rename _qt_internal_find_ios_development_team_id As well as the _qt_internal_apple_development_team_id_computed property. It's used for macOS as well, so use `apple` infix instead of `ios`. Pick-to: 6.9 6.8 6.5 Change-Id: I7932166d094a14ac32cce95e6c9fcbfa44bb97b4 Reviewed-by: Alexey Edelev --- cmake/QtPublicAppleHelpers.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/QtPublicAppleHelpers.cmake b/cmake/QtPublicAppleHelpers.cmake index ad7dd05e0b5..fd0142523b5 100644 --- a/cmake/QtPublicAppleHelpers.cmake +++ b/cmake/QtPublicAppleHelpers.cmake @@ -97,9 +97,9 @@ function(_qt_internal_handle_ios_launch_screen target) endif() endfunction() -function(_qt_internal_find_ios_development_team_id out_var) +function(_qt_internal_find_apple_development_team_id out_var) get_property(team_id GLOBAL PROPERTY _qt_internal_ios_development_team_id) - get_property(team_id_computed GLOBAL PROPERTY _qt_internal_ios_development_team_id_computed) + get_property(team_id_computed GLOBAL PROPERTY _qt_internal_apple_development_team_id_computed) if(team_id_computed) # Just in case if the value is non-empty but still booly FALSE. if(NOT team_id) @@ -109,7 +109,7 @@ function(_qt_internal_find_ios_development_team_id out_var) return() endif() - set_property(GLOBAL PROPERTY _qt_internal_ios_development_team_id_computed "TRUE") + set_property(GLOBAL PROPERTY _qt_internal_apple_development_team_id_computed "TRUE") set(home_dir "$ENV{HOME}") set(xcode_preferences_path "${home_dir}/Library/Preferences/com.apple.dt.Xcode.plist") @@ -270,7 +270,7 @@ function(_qt_internal_get_default_apple_bundle_identifier target out_var) # For a better out-of-the-box experience, try to create a unique prefix by appending # the sha1 of the team id, if one is found. - _qt_internal_find_ios_development_team_id(team_id) + _qt_internal_find_apple_development_team_id(team_id) if(team_id) string(SHA1 hash "${team_id}") string(SUBSTRING "${hash}" 0 8 infix) @@ -378,7 +378,7 @@ function(_qt_internal_set_xcode_development_team_id target) if(NOT CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM AND NOT QT_NO_SET_XCODE_DEVELOPMENT_TEAM_ID) get_target_property(existing_team_id "${target}" XCODE_ATTRIBUTE_DEVELOPMENT_TEAM) if(NOT existing_team_id) - _qt_internal_find_ios_development_team_id(team_id) + _qt_internal_find_apple_development_team_id(team_id) set_target_properties("${target}" PROPERTIES XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "${team_id}") endif()