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

cmake: Rename _qt_internal_find_ios_development_team_id

Browse Source 
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 <alexey.edelev@qt.io>
This commit is contained in:
Tor Arne Vestbø 2025-02-04 12:07:14 +01:00
parent 014e77801f
commit d688c73e08
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/QtPublicAppleHelpers.cmake
View File

@ -97,9 +97,9 @@ function(_qt_internal_handle_ios_launch_screen target)
endif() endif()
endfunction() 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 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) if(team_id_computed)
# Just in case if the value is non-empty but still booly FALSE. # Just in case if the value is non-empty but still booly FALSE.
if(NOT team_id) if(NOT team_id)
@ -109,7 +109,7 @@ function(_qt_internal_find_ios_development_team_id out_var)
return() return()
endif() 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(home_dir "$ENV{HOME}")
set(xcode_preferences_path "${home_dir}/Library/Preferences/com.apple.dt.Xcode.plist") 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 # 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. # 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) if(team_id)
string(SHA1 hash "${team_id}") string(SHA1 hash "${team_id}")
string(SUBSTRING "${hash}" 0 8 infix) 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) 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) get_target_property(existing_team_id "${target}" XCODE_ATTRIBUTE_DEVELOPMENT_TEAM)
if(NOT existing_team_id) 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}" set_target_properties("${target}"
PROPERTIES XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "${team_id}") PROPERTIES XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "${team_id}")
endif() endif()