summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2012-12-25 21:44:13 +0100
committerTor Arne Vestbø <tor.arne.vestbo@digia.com>2013-02-27 23:56:01 +0100
commitb05c20b4f33b35c8b3428caf2ee59675d858d5ab (patch)
treeff9400d9a5de1f5bc786e8bb8547a9a15929e00d /src
parente30659aaf500a2186dfe67f29ce57bea5bf86b76 (diff)
iOS: Don't check for existing window in QIOSMainWrapperApplicationDelegate
The delegate is only used when we control the application, so we know that there isn't any window yet. Change-Id: Ibd774cb4fd8ceaab6a181769d2792b569f490495 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/platforms/ios/qtmain.mm20
1 files changed, 8 insertions, 12 deletions
diff --git a/src/plugins/platforms/ios/qtmain.mm b/src/plugins/platforms/ios/qtmain.mm
index 61756edc93..7cc96f54b1 100644
--- a/src/plugins/platforms/ios/qtmain.mm
+++ b/src/plugins/platforms/ios/qtmain.mm
@@ -55,20 +55,16 @@ extern int qt_main(int argc, char *argv[]);
- (BOOL)application:(UIApplication *)application willFinishLaunchingWithOptions:(NSDictionary *)launchOptions
{
- // We may have a window already from a NIB or storyboard
- if (!self.window) {
- // If not, we create one ourselves
- self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
- QIOSViewController *controller = [[QIOSViewController alloc] init];
- self.window.rootViewController = controller;
- controller.view = [[UIView alloc] init];
+ self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+ QIOSViewController *controller = [[QIOSViewController alloc] init];
+ self.window.rootViewController = controller;
+ controller.view = [[UIView alloc] init];
- // Aid debugging during development
- self.window.backgroundColor = [UIColor cyanColor];
- self.window.rootViewController.view.backgroundColor = [UIColor magentaColor];
+ // Aid debugging during development
+ self.window.backgroundColor = [UIColor cyanColor];
+ self.window.rootViewController.view.backgroundColor = [UIColor magentaColor];
- [self.window makeKeyAndVisible];
- }
+ [self.window makeKeyAndVisible];
// We schedule the main-redirection for the next eventloop pass so that we
// can return from this function and let UIApplicationMain finish its job.