1 files changed, 45 insertions, 0 deletions
diff --git a/src/plugins/platforms/ios/qiosapplicationdelegate.mm b/src/plugins/platforms/ios/qiosapplicationdelegate.mm
index a017fef457..c6e5a83874 100644
--- a/src/plugins/platforms/ios/qiosapplicationdelegate.mm
+++ b/src/plugins/platforms/ios/qiosapplicationdelegate.mm
@@ -3,15 +3,21 @@
 
 #include "qiosapplicationdelegate.h"
 
+#include "qiosglobal.h"
 #include "qiosintegration.h"
 #include "qiosservices.h"
 #include "qiosviewcontroller.h"
 #include "qioswindow.h"
+#include "qiosscreen.h"
+#include "quiwindow.h"
 
 #include <qpa/qplatformintegration.h>
 
 #include <QtCore/QtCore>
 
+@interface QIOSWindowSceneDelegate : NSObject<UIWindowSceneDelegate>
+@end
+
 @implementation QIOSApplicationDelegate
 
 - (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray<id<UIUserActivityRestoring>> *restorableObjects))restorationHandler
@@ -50,5 +56,44 @@
     return iosServices->handleUrl(QUrl::fromNSURL(url));
 }
 
+- (UISceneConfiguration *)application:(UIApplication *)application
+                          configurationForConnectingSceneSession:(UISceneSession *)connectingSceneSession
+                          options:(UISceneConnectionOptions *)options
+{
+    qCDebug(lcQpaWindowScene) << "Configuring scene for" << connectingSceneSession
+        << "with options" << options;
+
+    auto *sceneConfig = connectingSceneSession.configuration;
+    sceneConfig.delegateClass = QIOSWindowSceneDelegate.class;
+    return sceneConfig;
+}
+
 @end
 
+@implementation QIOSWindowSceneDelegate
+
+- (void)scene:(UIScene *)scene willConnectToSession:(UISceneSession *)session options:(UISceneConnectionOptions *)connectionOptions
+{
+    qCDebug(lcQpaWindowScene) << "Connecting" << scene << "to" << session;
+
+    Q_ASSERT([scene isKindOfClass:UIWindowScene.class]);
+    UIWindowScene *windowScene = static_cast<UIWindowScene*>(scene);
+
+    QUIWindow *window = [[QUIWindow alloc] initWithWindowScene:windowScene];
+
+    QIOSScreen *screen = [&]{
+        for (auto *screen : qGuiApp->screens()) {
+            auto *platformScreen = static_cast<QIOSScreen*>(screen->handle());
+#if !defined(Q_OS_VISIONOS)
+            if (platformScreen->uiScreen() == windowScene.screen)
+#endif
+                return platformScreen;
+        }
+        Q_UNREACHABLE();
+    }();
+
+    window.rootViewController = [[[QIOSViewController alloc]
+        initWithWindow:window andScreen:screen] autorelease];
+}
+
+@end