diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-07-06 17:19:52 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-07-27 16:24:10 +0200 |
| commit | 578f4ba00c9fce9af922c9924ca104bc47e50f03 (patch) | |
| tree | ee6779544125d6ad2a4995e37c9a8b8d4115649f /cmake | |
| parent | f62412e6ec164e5e18292426152300d270b63905 (diff) | |
CMake: Add per-target support for iOS launch screens
To support per-target iOS launch screens we need a way to specify
custom Info.plist entries without using cache variables, which we were
forced to use due to the implicit configure_file done for
MACOSX_BUNDLE_INFO_PLIST.
We now introduce an extra configure_file call done in a finalizer,
before we hand off the Info.plist file to MACOSX_BUNDLE_INFO_PLIST.
This extra configure_file call allows us to insert / substitute
additional Info.plist entries that CMake does not allow setting.
If a custom Info.plist file is provided, the finalizer will simply
skip the logic for creating a new one.
Amends e5b3436255ce095af58608b03b913fc9bcb8e61f
Pick-to: 6.4
Fixes: QTBUG-101064
Change-Id: I65496da146c9430a949a8163817021d54da28386
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBaseGlobalTargets.cmake | 2 | ||||
| -rw-r--r-- | cmake/ios/Info.plist.app.in (renamed from cmake/ios/MacOSXBundleInfo.plist.in) | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmake/QtBaseGlobalTargets.cmake b/cmake/QtBaseGlobalTargets.cmake index 43170f163f..0fc74a5bf1 100644 --- a/cmake/QtBaseGlobalTargets.cmake +++ b/cmake/QtBaseGlobalTargets.cmake @@ -384,7 +384,7 @@ if(MACOS) ) elseif(IOS) qt_copy_or_install(FILES - cmake/ios/MacOSXBundleInfo.plist.in + cmake/ios/Info.plist.app.in cmake/ios/LaunchScreen.storyboard DESTINATION "${__GlobalConfig_install_dir}/ios" ) diff --git a/cmake/ios/MacOSXBundleInfo.plist.in b/cmake/ios/Info.plist.app.in index 0cecf4ba99..f2cbe593b2 100644 --- a/cmake/ios/MacOSXBundleInfo.plist.in +++ b/cmake/ios/Info.plist.app.in @@ -42,7 +42,7 @@ <string>This file was generated by Qt's default CMake support.</string> <key>UILaunchStoryboardName</key> - <string>${QT_INTERNAL_IOS_LAUNCH_SCREEN_PLIST_ENTRY}</string> + <string>@qt_ios_launch_screen_plist_entry@</string> <key>UISupportedInterfaceOrientations</key> <array> |