diff options
author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-03-18 14:30:28 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-19 10:36:10 +0100 |
commit | f8624b188b648defb82f65772ccc38286d1b8586 (patch) | |
tree | c460edf3c0f39f3b9dc6fcbfe798a5e684a2fa07 /src/plugins/platforms | |
parent | 5bc32bcced8de4cd773edc992ea0be7dd426dcf3 (diff) |
iOS: Use didFinishLaunchingWithOptions to support iOS < 6.0
UIApplicationDelegate's willFinishLaunchingWithOptions message was
introduced in 6.0. For now we don't need to distinguish the two, so
no need to use willFinishLaunchingWithOptions on iOS >= 6.0.
Change-Id: Ic6c2c9d2901def5a5500b186ed57fbe8b8c556d1
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Diffstat (limited to 'src/plugins/platforms')
-rw-r--r-- | src/plugins/platforms/ios/qtmain.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/ios/qtmain.mm b/src/plugins/platforms/ios/qtmain.mm index 10c83f4b18..916224f936 100644 --- a/src/plugins/platforms/ios/qtmain.mm +++ b/src/plugins/platforms/ios/qtmain.mm @@ -53,7 +53,7 @@ extern int qt_main(int argc, char *argv[]); @implementation QIOSMainWrapperApplicationDelegate -- (BOOL)application:(UIApplication *)application willFinishLaunchingWithOptions:(NSDictionary *)launchOptions +- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { self.window = [[[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]] autorelease]; self.window.rootViewController = [[[QIOSViewController alloc] init] autorelease]; @@ -70,7 +70,7 @@ extern int qt_main(int argc, char *argv[]); selector:@selector(runUserMain) userInfo:nil repeats:NO]; if ([QIOSApplicationDelegate instancesRespondToSelector:_cmd]) - return [super application:application willFinishLaunchingWithOptions:launchOptions]; + return [super application:application didFinishLaunchingWithOptions:launchOptions]; else return YES; } |