diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-01-08 10:38:20 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-01-08 10:38:20 +0100 |
| commit | b5b47f7df2a70064f5e1041cefb18636d20d0bd4 (patch) | |
| tree | 7f57b886355129a7dd13611787b7de96065dde3a /src/tools/3rdparty | |
| parent | 0a5186700c036a541f5fa0baebb5e9ce0d506fed (diff) | |
| parent | ecd9c4c813be37dec46514462f1fcba901165a93 (diff) | |
| download | qt-creator-b5b47f7df2a70064f5e1041cefb18636d20d0bd4.tar.gz | |
Merge remote-tracking branch 'origin/3.3'
Conflicts:
src/plugins/cppeditor/cppdocumentationcommenthelper.cpp
Change-Id: I2cf25eba1de149765a6c44ad354d606ce9de512d
Diffstat (limited to 'src/tools/3rdparty')
| -rw-r--r-- | src/tools/3rdparty/iossim/iphonesimulator.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/3rdparty/iossim/iphonesimulator.mm b/src/tools/3rdparty/iossim/iphonesimulator.mm index b120fab64e..c75acef7a9 100644 --- a/src/tools/3rdparty/iossim/iphonesimulator.mm +++ b/src/tools/3rdparty/iossim/iphonesimulator.mm @@ -608,8 +608,8 @@ static void ChildSignal(int /*arg*/) { NSArray* devices = [deviceSet availableDevices]; NSArray* deviceTypeAndVersion = [devTypeId componentsSeparatedByString:@","]; if(deviceTypeAndVersion.count == 2) { - NSString* typeIdentifier = [deviceTypeAndVersion.firstObject stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]; - NSString* versionString = [deviceTypeAndVersion.lastObject stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];; + NSString* typeIdentifier = [[deviceTypeAndVersion objectAtIndex:0] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]; + NSString* versionString = [[deviceTypeAndVersion objectAtIndex:1] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];; for (SimDevice* device in devices) { if ([device.deviceType.identifier isEqualToString:typeIdentifier] && [device.runtime.versionString isEqualToString:versionString]) { return device; |