aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/ios/iosrunconfiguration.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/ios/iosrunconfiguration.cpp')
-rw-r--r--src/plugins/ios/iosrunconfiguration.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp
index 674710df57..cdcbff90b6 100644
--- a/src/plugins/ios/iosrunconfiguration.cpp
+++ b/src/plugins/ios/iosrunconfiguration.cpp
@@ -102,7 +102,7 @@ public:
QComboBox *m_deviceTypeComboBox = nullptr;
};
-IosRunConfiguration::IosRunConfiguration(Target *target, Core::Id id)
+IosRunConfiguration::IosRunConfiguration(Target *target, Utils::Id id)
: RunConfiguration(target, id)
{
auto executableAspect = addAspect<ExecutableAspect>();
@@ -140,7 +140,7 @@ void IosDeviceTypeAspect::updateDeviceType()
bool IosRunConfiguration::isEnabled() const
{
- Core::Id devType = DeviceTypeKitAspect::deviceTypeId(target()->kit());
+ Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(target()->kit());
if (devType != Constants::IOS_DEVICE_TYPE && devType != Constants::IOS_SIMULATOR_TYPE)
return false;
@@ -162,7 +162,7 @@ QString IosRunConfiguration::applicationName() const
FilePath IosRunConfiguration::bundleDirectory() const
{
- Core::Id devType = DeviceTypeKitAspect::deviceTypeId(target()->kit());
+ Utils::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();
@@ -179,7 +179,7 @@ FilePath IosRunConfiguration::bundleDirectory() const
case BuildConfiguration::Debug :
case BuildConfiguration::Unknown :
if (isDevice)
- res = res.pathAppended("Debug-iphoneos");
+ res = res / "Debug-iphoneos";
else
res = res.pathAppended("Debug-iphonesimulator");
break;
@@ -220,7 +220,7 @@ void IosDeviceTypeAspect::toMap(QVariantMap &map) const
QString IosRunConfiguration::disabledReason() const
{
- Core::Id devType = DeviceTypeKitAspect::deviceTypeId(target()->kit());
+ Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(target()->kit());
if (devType != Constants::IOS_DEVICE_TYPE && devType != Constants::IOS_SIMULATOR_TYPE)
return tr("Kit has incorrect device type for running on iOS devices.");
IDevice::ConstPtr dev = DeviceKitAspect::device(target()->kit());