diff options
author | Christoph Keller <keller@conntac.net> | 2021-04-07 14:39:13 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-04-07 13:32:17 +0000 |
commit | 9c24ad3b94cb8c67468e947f02dd1f9aaf246085 (patch) | |
tree | 81bdccd841f5e88c7ceb2d063273e22434620348 /mkspecs | |
parent | Merge integration refs/builds/qtci/dev/1617784151 (diff) | |
download | qtbase-9c24ad3b94cb8c67468e947f02dd1f9aaf246085.tar.xz qtbase-9c24ad3b94cb8c67468e947f02dd1f9aaf246085.zip |
Only embed launch screen when building an app
Xcode's new build system checks duplicated entries when building. Qmake wants to embed
the launch screen for all types of configurations (static libraries etc.) which makes Xcode bail
out with "Multiple commands produce LaunchScreen.storyboard".
Pick-to: 6.0 6.1 5.15 5.12
Task-number: QTBUG-71035
Change-Id: I5c028e687f16e046b12156c1a8a89540deba4d3b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/features/uikit/default_post.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/uikit/default_post.prf b/mkspecs/features/uikit/default_post.prf index 80c1fc66cd..0cac4c0177 100644 --- a/mkspecs/features/uikit/default_post.prf +++ b/mkspecs/features/uikit/default_post.prf @@ -28,7 +28,7 @@ macx-xcode { device_family.value = $$QMAKE_APPLE_TARGETED_DEVICE_FAMILY QMAKE_MAC_XCODE_SETTINGS += device_family - ios { + equals(TEMPLATE, app):ios { isEmpty(QMAKE_IOS_LAUNCH_SCREEN) { qmake_launch_screen = LaunchScreen.storyboard qmake_copy_launch_screen.input = $$QMAKESPEC/$$qmake_launch_screen |