From d5f759cf6684d4d3574f5306cb5129861cab7103 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:46:03 +0200
Subject: iOS: Use storyboard instead of .xib file for launch screen

Apps on the iOS app store are required to use storyboards for their
launch screens from June 30th 2020.

Change-Id: Iae34042294fb167a2c893542c57dfaacaf1e929c
Fixes: QTBUG-83512
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 mkspecs/features/uikit/default_post.prf        |  2 +-
 mkspecs/macx-ios-clang/LaunchScreen.storyboard | 48 ++++++++++++++++++++++++++
 mkspecs/macx-ios-clang/LaunchScreen.xib        | 45 ------------------------
 3 files changed, 49 insertions(+), 46 deletions(-)
 create mode 100644 mkspecs/macx-ios-clang/LaunchScreen.storyboard
 delete mode 100644 mkspecs/macx-ios-clang/LaunchScreen.xib

diff --git a/mkspecs/features/uikit/default_post.prf b/mkspecs/features/uikit/default_post.prf
index c1b6f38a6c..088b39ff3f 100644
--- a/mkspecs/features/uikit/default_post.prf
+++ b/mkspecs/features/uikit/default_post.prf
@@ -43,7 +43,7 @@ macx-xcode {
             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.xib
+            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
diff --git a/mkspecs/macx-ios-clang/LaunchScreen.storyboard b/mkspecs/macx-ios-clang/LaunchScreen.storyboard
new file mode 100644
index 0000000000..7d8d9a3405
--- /dev/null
+++ b/mkspecs/macx-ios-clang/LaunchScreen.storyboard
@@ -0,0 +1,48 @@
+<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>
+<document type=\"com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB\" version=\"3.0\" toolsVersion=\"13142\" targetRuntime=\"iOS.CocoaTouch\" propertyAccessControl=\"none\" useAutolayout=\"YES\" launchScreen=\"YES\" useTraitCollections=\"YES\" useSafeAreas=\"YES\" colorMatched=\"YES\" initialViewController=\"01J-lp-oVM\">
+    <dependencies>
+        <plugIn identifier=\"com.apple.InterfaceBuilder.IBCocoaTouchPlugin\" version=\"12042\"/>
+        <capability name=\"Constraints with non-1.0 multipliers\" minToolsVersion=\"5.1\"/>
+        <capability name=\"Safe area layout guides\" minToolsVersion=\"9.0\"/>
+        <capability name=\"documents saved in the Xcode 8 format\" minToolsVersion=\"8.0\"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID=\"EHf-IW-A2E\">
+            <objects>
+                <viewController id=\"01J-lp-oVM\" sceneMemberID=\"viewController\">
+                    <view key=\"view\" contentMode=\"scaleToFill\" id=\"Ze5-6b-2t3\">
+                        <rect key=\"frame\" x=\"0.0\" y=\"0.0\" width=\"375\" height=\"667\"/>
+                        <autoresizingMask key=\"autoresizingMask\" widthSizable=\"YES\" heightSizable=\"YES\"/>
+                        <subviews>
+                            <label opaque=\"NO\" clipsSubviews=\"YES\" userInteractionEnabled=\"NO\" contentMode=\"left\" horizontalHuggingPriority=\"251\" verticalHuggingPriority=\"251\" text=\"\" textAlignment=\"center\" lineBreakMode=\"tailTruncation\" baselineAdjustment=\"alignBaselines\" minimumFontSize=\"9\" translatesAutoresizingMaskIntoConstraints=\"NO\" id=\"obG-Y5-kRd\">
+                                <rect key=\"frame\" x=\"0.0\" y=\"626.5\" width=\"375\" height=\"20.5\"/>
+                                <fontDescription key=\"fontDescription\" type=\"system\" pointSize=\"17\"/>
+                                <color key=\"textColor\" red=\"0.0\" green=\"0.0\" blue=\"0.0\" alpha=\"1\" colorSpace=\"custom\" customColorSpace=\"sRGB\"/>
+                                <nil key=\"highlightedColor\"/>
+                            </label>
+                            <label opaque=\"NO\" clipsSubviews=\"YES\" userInteractionEnabled=\"NO\" contentMode=\"left\" horizontalHuggingPriority=\"251\" verticalHuggingPriority=\"251\" text=\"$$TARGET\" textAlignment=\"center\" lineBreakMode=\"middleTruncation\" baselineAdjustment=\"alignBaselines\" minimumFontSize=\"18\" translatesAutoresizingMaskIntoConstraints=\"NO\" id=\"GJd-Yh-RWb\">
+                                <rect key=\"frame\" x=\"0.0\" y=\"202\" width=\"375\" height=\"43\"/>
+                                <fontDescription key=\"fontDescription\" type=\"boldSystem\" pointSize=\"36\"/>
+                                <color key=\"textColor\" red=\"0.0\" green=\"0.0\" blue=\"0.0\" alpha=\"1\" colorSpace=\"custom\" customColorSpace=\"sRGB\"/>
+                                <nil key=\"highlightedColor\"/>
+                            </label>
+                        </subviews>
+                        <color key=\"backgroundColor\" red=\"1\" green=\"1\" blue=\"1\" alpha=\"1\" colorSpace=\"custom\" customColorSpace=\"sRGB\"/>
+                        <constraints>
+                            <constraint firstItem=\"Bcu-3y-fUS\" firstAttribute=\"centerX\" secondItem=\"obG-Y5-kRd\" secondAttribute=\"centerX\" id=\"5cz-MP-9tL\"/>
+                            <constraint firstItem=\"Bcu-3y-fUS\" firstAttribute=\"centerX\" secondItem=\"GJd-Yh-RWb\" secondAttribute=\"centerX\" id=\"Q3B-4B-g5h\"/>
+                            <constraint firstItem=\"obG-Y5-kRd\" firstAttribute=\"leading\" secondItem=\"Bcu-3y-fUS\" secondAttribute=\"leading\" constant=\"20\" symbolic=\"YES\" id=\"SfN-ll-jLj\"/>
+                            <constraint firstAttribute=\"bottom\" secondItem=\"obG-Y5-kRd\" secondAttribute=\"bottom\" constant=\"20\" id=\"Y44-ml-fuU\"/>
+                            <constraint firstItem=\"GJd-Yh-RWb\" firstAttribute=\"centerY\" secondItem=\"Ze5-6b-2t3\" secondAttribute=\"bottom\" multiplier=\"1/3\" constant=\"1\" id=\"moa-c2-u7t\"/>
+                            <constraint firstItem=\"GJd-Yh-RWb\" firstAttribute=\"leading\" secondItem=\"Bcu-3y-fUS\" secondAttribute=\"leading\" constant=\"20\" symbolic=\"YES\" id=\"x7j-FC-K8j\"/>
+                        </constraints>
+                        <viewLayoutGuide key=\"safeArea\" id=\"Bcu-3y-fUS\"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier=\"IBFirstResponder\" id=\"iYj-Kq-Ea1\" userLabel=\"First Responder\" sceneMemberID=\"firstResponder\"/>
+            </objects>
+            <point key=\"canvasLocation\" x=\"53\" y=\"375\"/>
+        </scene>
+    </scenes>
+</document>
diff --git a/mkspecs/macx-ios-clang/LaunchScreen.xib b/mkspecs/macx-ios-clang/LaunchScreen.xib
deleted file mode 100644
index d28c06b375..0000000000
--- a/mkspecs/macx-ios-clang/LaunchScreen.xib
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>
-<document type=\"com.apple.InterfaceBuilder3.CocoaTouch.XIB\" version=\"3.0\" toolsVersion=\"6250\" systemVersion=\"14A343f\" targetRuntime=\"iOS.CocoaTouch\" propertyAccessControl=\"none\" useAutolayout=\"YES\" launchScreen=\"YES\" useTraitCollections=\"YES\">
-    <dependencies>
-        <plugIn identifier=\"com.apple.InterfaceBuilder.IBCocoaTouchPlugin\" version=\"6244\"/>
-        <capability name=\"Constraints with non-1.0 multipliers\" minToolsVersion=\"5.1\"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier=\"IBFilesOwner\" id=\"-1\" userLabel=\"File\'s Owner\"/>
-        <placeholder placeholderIdentifier=\"IBFirstResponder\" id=\"-2\" customClass=\"UIResponder\"/>
-        <view contentMode=\"scaleToFill\" id=\"iN0-l3-epB\">
-            <rect key=\"frame\" x=\"0.0\" y=\"0.0\" width=\"480\" height=\"480\"/>
-            <autoresizingMask key=\"autoresizingMask\" widthSizable=\"YES\" heightSizable=\"YES\"/>
-            <subviews>
-                <label opaque=\"NO\" clipsSubviews=\"YES\" userInteractionEnabled=\"NO\" contentMode=\"left\" horizontalHuggingPriority=\"251\" verticalHuggingPriority=\"251\" misplaced=\"YES\" text=\"\" textAlignment=\"center\" lineBreakMode=\"tailTruncation\" baselineAdjustment=\"alignBaselines\" minimumFontSize=\"9\" translatesAutoresizingMaskIntoConstraints=\"NO\" id=\"8ie-xW-0ye\">
-                    <rect key=\"frame\" x=\"20\" y=\"439\" width=\"441\" height=\"21\"/>
-                    <fontDescription key=\"fontDescription\" type=\"system\" pointSize=\"17\"/>
-                    <color key=\"textColor\" cocoaTouchSystemColor=\"darkTextColor\"/>
-                    <nil key=\"highlightedColor\"/>
-                    <variation key=\"widthClass=compact\">
-                        <fontDescription key=\"fontDescription\" type=\"system\" pointSize=\"11\"/>
-                    </variation>
-                </label>
-                <label opaque=\"NO\" clipsSubviews=\"YES\" userInteractionEnabled=\"NO\" contentMode=\"left\" horizontalHuggingPriority=\"251\" verticalHuggingPriority=\"251\" text=\"$$TARGET\"
-                    textAlignment=\"center\" lineBreakMode=\"middleTruncation\" baselineAdjustment=\"alignBaselines\" minimumFontSize=\"18\" translatesAutoresizingMaskIntoConstraints=\"NO\" id=\"kId-c2-rCX\">
-                    <rect key=\"frame\" x=\"20\" y=\"140\" width=\"441\" height=\"43\"/>
-                    <fontDescription key=\"fontDescription\" type=\"boldSystem\" pointSize=\"36\"/>
-                    <color key=\"textColor\" cocoaTouchSystemColor=\"darkTextColor\"/>
-                    <nil key=\"highlightedColor\"/>
-                </label>
-            </subviews>
-            <color key=\"backgroundColor\" white=\"1\" alpha=\"1\" colorSpace=\"custom\" customColorSpace=\"calibratedWhite\"/>
-            <constraints>
-                <constraint firstItem=\"kId-c2-rCX\" firstAttribute=\"centerY\" secondItem=\"iN0-l3-epB\" secondAttribute=\"bottom\" multiplier=\"1/3\" constant=\"1\" id=\"Kid-kn-2rF\"/>
-                <constraint firstAttribute=\"centerX\" secondItem=\"kId-c2-rCX\" secondAttribute=\"centerX\" id=\"Koa-jz-hwk\"/>
-                <constraint firstAttribute=\"bottom\" secondItem=\"8ie-xW-0ye\" secondAttribute=\"bottom\" constant=\"20\" id=\"Kzo-t9-V3l\"/>
-                <constraint firstItem=\"8ie-xW-0ye\" firstAttribute=\"leading\" secondItem=\"iN0-l3-epB\" secondAttribute=\"leading\" constant=\"20\" symbolic=\"YES\" id=\"MfP-vx-nX0\"/>
-                <constraint firstAttribute=\"centerX\" secondItem=\"8ie-xW-0ye\" secondAttribute=\"centerX\" id=\"ZEH-qu-HZ9\"/>
-                <constraint firstItem=\"kId-c2-rCX\" firstAttribute=\"leading\" secondItem=\"iN0-l3-epB\" secondAttribute=\"leading\" constant=\"20\" symbolic=\"YES\" id=\"fvb-Df-36g\"/>
-            </constraints>
-            <nil key=\"simulatedStatusBarMetrics\"/>
-            <freeformSimulatedSizeMetrics key=\"simulatedDestinationMetrics\"/>
-            <point key=\"canvasLocation\" x=\"404\" y=\"445\"/>
-        </view>
-    </objects>
-</document>
-- 
cgit v1.2.3