From f35745a30c631b3ce6b5a435fd4571595b952749 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Fri, 24 Apr 2020 12:51:49 +0200
Subject: [PATCH] iOS: Remove deprecated image-based launch screen
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I50a7121c55170e1fb6950fdf7bb854cf6699df67
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 mkspecs/features/uikit/default_post.prf    |  28 ++++++---------------
 mkspecs/macx-ios-clang/Default-568h@2x.png | Bin 18594 -> 0 bytes
 2 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100644 mkspecs/macx-ios-clang/Default-568h@2x.png

diff --git a/mkspecs/features/uikit/default_post.prf b/mkspecs/features/uikit/default_post.prf
index 088b39ff3f..9a429b1f6e 100644
--- a/mkspecs/features/uikit/default_post.prf
+++ b/mkspecs/features/uikit/default_post.prf
@@ -29,27 +29,13 @@ macx-xcode {
     QMAKE_MAC_XCODE_SETTINGS += device_family
 
     ios {
-        # Set up default 4-inch iPhone/iPod launch image so that our apps
-        # support the full screen resolution of those devices.
-        qmake_launch_image = Default-568h@2x.png
-        qmake_copy_image.input = $$QMAKESPEC/$$qmake_launch_image
-        qmake_copy_image.output = $$OUT_PWD/$${TARGET}.xcodeproj/$$qmake_launch_image
-        qmake_copy_image.CONFIG = verbatim
-        QMAKE_SUBSTITUTES += qmake_copy_image
-        qmake_launch_images.files = $$qmake_copy_image.output
-        QMAKE_BUNDLE_DATA += qmake_launch_images
-
-        !versionAtLeast(QMAKE_XCODE_VERSION, 6.0) {
-            warning("You need to update Xcode to version 6 or newer to fully support iPhone6/6+")
-        } else {
-            # Set up default LaunchScreen to support iPhone6/6+
-            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
-            QMAKE_BUNDLE_DATA += qmake_launch_screens
-        }
+        # 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
+        QMAKE_BUNDLE_DATA += qmake_launch_screens
     }
 }
 
diff --git a/mkspecs/macx-ios-clang/Default-568h@2x.png b/mkspecs/macx-ios-clang/Default-568h@2x.png
deleted file mode 100644
index 0891b7aabfcf3422423b109c8beed2bab838c607..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18594
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