diff options
author | hjk <[email protected]> | 2019-05-15 15:49:19 +0200 |
---|---|---|
committer | hjk <[email protected]> | 2019-05-17 09:26:57 +0000 |
commit | 166cb39709427085db7294c9f42a9847d9ce3a84 (patch) | |
tree | b0728976e5612a2e3833cb9596e50d25640eb892 /src/plugins/ios/iosrunconfiguration.cpp | |
parent | c874f07d53ea8a0d4b2c0ead4b7671c2aec99eb2 (diff) |
iOS: More FileName::appendPath -> pathAppended changes
Change-Id: I3db6b1778e6e47e26e243fb2609c481651aa91fe
Reviewed-by: Christian Stenger <[email protected]>
Diffstat (limited to 'src/plugins/ios/iosrunconfiguration.cpp')
-rw-r--r-- | src/plugins/ios/iosrunconfiguration.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp index 4f1ade7c42c..233abbd26fc 100644 --- a/src/plugins/ios/iosrunconfiguration.cpp +++ b/src/plugins/ios/iosrunconfiguration.cpp @@ -165,13 +165,13 @@ QString IosRunConfiguration::applicationName() const FileName IosRunConfiguration::bundleDirectory() const { - FileName res; Core::Id devType = DeviceTypeKitAspect::deviceTypeId(target()->kit()); bool isDevice = (devType == Constants::IOS_DEVICE_TYPE); if (!isDevice && devType != Constants::IOS_SIMULATOR_TYPE) { qCWarning(iosLog) << "unexpected device type in bundleDirForTarget: " << devType.toString(); - return res; + return {}; } + FileName res; if (BuildConfiguration *bc = target()->activeBuildConfiguration()) { Project *project = target()->project(); if (ProjectNode *node = project->findNodeForBuildKey(buildKey())) @@ -182,29 +182,28 @@ FileName IosRunConfiguration::bundleDirectory() const case BuildConfiguration::Debug : case BuildConfiguration::Unknown : if (isDevice) - res.appendPath(QLatin1String("Debug-iphoneos")); + res = res.pathAppended("Debug-iphoneos"); else - res.appendPath(QLatin1String("Debug-iphonesimulator")); + res = res.pathAppended("Debug-iphonesimulator"); break; case BuildConfiguration::Profile : case BuildConfiguration::Release : if (isDevice) - res.appendPath(QLatin1String("Release-iphoneos")); + res = res.pathAppended("Release-iphoneos"); else - res.appendPath(QLatin1String("Release-iphonesimulator")); + res = res.pathAppended("Release-iphonesimulator"); break; default: qCWarning(iosLog) << "IosBuildStep had an unknown buildType " << target()->activeBuildConfiguration()->buildType(); } } - res.appendPath(applicationName() + QLatin1String(".app")); - return res; + return res.pathAppended(applicationName() + ".app"); } FileName IosRunConfiguration::localExecutable() const { - return bundleDirectory().appendPath(applicationName()); + return bundleDirectory().pathAppended(applicationName()); } void IosDeviceTypeAspect::fromMap(const QVariantMap &map) |