diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-08-24 17:49:04 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-08-31 08:53:50 +0000 |
| commit | 9bc03ed4252b0b1fa24c8d1161a95ba9f9cb6a38 (patch) | |
| tree | d0093d33a6e2dd5a3b625d6a2ad43d37cffd0262 /src | |
| parent | 3cbb6c1438920c5ad98b186db4f1e2537d98663c (diff) | |
CMake: Fix storyboard entry in an iOS Info.plist file
It should not contain the .storyboard file extension, just
the base name.
Amends 578f4ba00c9fce9af922c9924ca104bc47e50f03
Task-number: QTBUG-101064
Change-Id: I70ce4581baec7cd62c2dae25c1ed963be28eddfe
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 5b43a673df8b83d23ed0b9f9f77cbd901c306d20)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/Qt6CoreMacros.cmake | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 434942cf2a..e4b92a932c 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -801,8 +801,11 @@ function(_qt_internal_handle_ios_launch_screen target) # Save the launch screen name, so its value is added as an UILaunchStoryboardName entry # in the Qt generated Info.plist file. + # Xcode expects an Info.plist storyboard entry without an extension. + get_filename_component(launch_screen_base_name "${launch_screen}" NAME_WE) set_target_properties("${target}" PROPERTIES _qt_ios_launch_screen_name "${launch_screen_name}" + _qt_ios_launch_screen_base_name "${launch_screen_base_name}" _qt_ios_launch_screen_path "${final_launch_screen_path}") endif() endfunction() @@ -1223,9 +1226,9 @@ function(_qt_internal_generate_ios_info_plist target) set(info_plist_out "${info_plist_out_dir}/Info.plist") # Check if we need to specify a custom launch screen storyboard entry. - get_target_property(launch_screen_name "${target}" _qt_ios_launch_screen_name) - if(launch_screen_name) - set(qt_ios_launch_screen_plist_entry "${launch_screen_name}") + get_target_property(launch_screen_base_name "${target}" _qt_ios_launch_screen_base_name) + if(launch_screen_base_name) + set(qt_ios_launch_screen_plist_entry "${launch_screen_base_name}") endif() # Call configure_file to substitute Qt-specific @FOO@ values, not ${FOO} values. |