diff options
| author | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2013-10-10 15:15:49 +0200 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2013-10-29 14:03:58 +0100 |
| commit | c162ba1391674fe942ff7449a81a64ecfc31e421 (patch) | |
| tree | 2405502654e8dc5a74d62cfc429f9fa6392e377a /src/tools/3rdparty | |
| parent | dc5ba1127dc67c848a8be46b4b42a3d0d5e99851 (diff) | |
| download | qt-creator-c162ba1391674fe942ff7449a81a64ecfc31e421.tar.gz | |
ios simulator debugging
Change-Id: Ieee4a509b46da937c3bce21f72c77685946db4dd
Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/tools/3rdparty')
| -rw-r--r-- | src/tools/3rdparty/iossim/iossim.pro | 3 | ||||
| -rw-r--r-- | src/tools/3rdparty/iossim/iphonesimulator.mm | 17 |
2 files changed, 17 insertions, 3 deletions
diff --git a/src/tools/3rdparty/iossim/iossim.pro b/src/tools/3rdparty/iossim/iossim.pro index 63d21886b5..cd153ea73c 100644 --- a/src/tools/3rdparty/iossim/iossim.pro +++ b/src/tools/3rdparty/iossim/iossim.pro @@ -1,5 +1,8 @@ CONFIG += console +QT += core +QT += gui + CONFIG -= app_bundle include(../../../../qtcreator.pri) diff --git a/src/tools/3rdparty/iossim/iphonesimulator.mm b/src/tools/3rdparty/iossim/iphonesimulator.mm index c746775314..78955216a4 100644 --- a/src/tools/3rdparty/iossim/iphonesimulator.mm +++ b/src/tools/3rdparty/iossim/iphonesimulator.mm @@ -14,8 +14,8 @@ NSString *simulatorPrefrencesName = @"com.apple.iphonesimulator"; NSString *deviceProperty = @"SimulateDevice"; -NSString *deviceIphoneRetina3_5Inch = @"iPhone (Retina 3.5-inch)"; -NSString *deviceIphoneRetina4_0Inch = @"iPhone (Retina 4-inch)"; +NSString *deviceIphoneRetina3_5Inch = @"iPhone Retina (3.5-inch)"; +NSString *deviceIphoneRetina4_0Inch = @"iPhone Retina (4-inch)"; NSString *deviceIphone = @"iPhone"; NSString *deviceIpad = @"iPad"; NSString *deviceIpadRetina = @"iPad (Retina)"; @@ -156,6 +156,7 @@ NSString *deviceIpadRetina = @"iPad (Retina)"; return; } nsprintf(@"<inferior_pid>%@</inferior_pid>", [session simulatedApplicationPID]); + fflush(stdout); pidCheckingTimer = [[NSTimer scheduledTimerWithTimeInterval:5.0 target:self selector:@selector(checkPid:) userInfo:nil repeats: TRUE] retain]; } else { @@ -266,6 +267,16 @@ NSString *deviceIpadRetina = @"iPad (Retina)"; } } + + NSString *sdkVersion = [sdkRoot sdkVersion]; + NSString *appSupportDir = [NSString stringWithFormat:@"%@/Library/Application Support/iPhone Simulator/%@", + NSHomeDirectory(), sdkVersion]; + [environment addEntriesFromDictionary:@{ + @"CFFIXED_USER_HOME" : appSupportDir, + @"IPHONE_SIMULATOR_ROOT" : [sdkRoot sdkRootPath], + @"NSUnbufferedIO" : @"YES", + }]; + /* Set up the session configuration */ tClass = objc_getClass("DTiPhoneSimulatorSessionConfig"); if (tClass == nil) { @@ -275,7 +286,7 @@ NSString *deviceIpadRetina = @"iPad (Retina)"; config = [[[tClass alloc] init] autorelease]; [config setApplicationToSimulateOnStart:appSpec]; [config setSimulatedSystemRoot:sdkRoot]; - [config setSimulatedApplicationShouldWaitForDebugger:shouldStartDebugger]; + [config setSimulatedApplicationShouldWaitForDebugger:shouldWaitDebugger]; [config setSimulatedApplicationLaunchArgs:args]; [config setSimulatedApplicationLaunchEnvironment:environment]; |