From 64491c9b72258fb16bf7d9c0eb1877a1b5c1c320 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Tue, 16 Apr 2019 08:32:33 +0200 Subject: iOS: Add a variable to customize where the launch image is taken from MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For those who are providing their own launch images for their iOS projects then QMAKE_IOS_LAUNCH_SCREEN can be set to point to the location where the launch image to be used over the default. [ChangeLog][Platform Specific Changes][iOS] Added support for specifying a launch image to be used for an iOS project. This can be achieved by using QMAKE_IOS_LAUNCH_SCREEN. Change-Id: Ibb236655b282132ab5eee747986a93abb9802200 Reviewed-by: Tor Arne Vestbø --- mkspecs/features/uikit/default_post.prf | 15 +++++++++------ mkspecs/macx-ios-clang/Info.plist.app | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/uikit/default_post.prf b/mkspecs/features/uikit/default_post.prf index 9a429b1f6e..80c1fc66cd 100644 --- a/mkspecs/features/uikit/default_post.prf +++ b/mkspecs/features/uikit/default_post.prf @@ -29,12 +29,15 @@ macx-xcode { QMAKE_MAC_XCODE_SETTINGS += device_family ios { - # Set up default LaunchScreen - qmake_launch_screen = LaunchScreen.storyboard - qmake_copy_launch_screen.input = $$QMAKESPEC/$$qmake_launch_screen - qmake_copy_launch_screen.output = $$OUT_PWD/$${TARGET}.xcodeproj/$$qmake_launch_screen - QMAKE_SUBSTITUTES += qmake_copy_launch_screen - qmake_launch_screens.files = $$qmake_copy_launch_screen.output + isEmpty(QMAKE_IOS_LAUNCH_SCREEN) { + qmake_launch_screen = LaunchScreen.storyboard + qmake_copy_launch_screen.input = $$QMAKESPEC/$$qmake_launch_screen + qmake_copy_launch_screen.output = $$OUT_PWD/$${TARGET}.xcodeproj/$$qmake_launch_screen + QMAKE_SUBSTITUTES += qmake_copy_launch_screen + qmake_launch_screens.files = $$qmake_copy_launch_screen.output + } else { + qmake_launch_screens.files = $$QMAKE_IOS_LAUNCH_SCREEN + } QMAKE_BUNDLE_DATA += qmake_launch_screens } } diff --git a/mkspecs/macx-ios-clang/Info.plist.app b/mkspecs/macx-ios-clang/Info.plist.app index 03ba3e82b4..ecea6c0377 100644 --- a/mkspecs/macx-ios-clang/Info.plist.app +++ b/mkspecs/macx-ios-clang/Info.plist.app @@ -27,7 +27,7 @@ NOTE This file was generated by Qt/QMake. UILaunchStoryboardName - LaunchScreen + ${IOS_LAUNCH_SCREEN} UISupportedInterfaceOrientations UIInterfaceOrientationPortrait -- cgit v1.2.3