feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Introduce a ProjectConfiguration::kit() function

Browse Source 
For convenience, and use it in some places.

Change-Id: I8f7cb502b37b2fbf4cf2d17cac9c6299558332dc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-09-07 15:56:18 +02:00
parent 552a1296fe
commit 61bfd32438
34 changed files with 82 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/ios/iosrunconfiguration.cpp
View File

@@ -131,7 +131,7 @@ void IosDeviceTypeAspect::deviceChanges()
void IosDeviceTypeAspect::updateDeviceType()
{
if (DeviceTypeKitAspect::deviceTypeId(m_runConfiguration->target()->kit())
if (DeviceTypeKitAspect::deviceTypeId(m_runConfiguration->kit())
== Constants::IOS_DEVICE_TYPE)
m_deviceType = IosDeviceType(IosDeviceType::IosDevice);
else if (m_deviceType.type == IosDeviceType::IosDevice)
@@ -140,11 +140,11 @@ void IosDeviceTypeAspect::updateDeviceType()
bool IosRunConfiguration::isEnabled() const
{
Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(target()->kit());
Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(kit());
if (devType != Constants::IOS_DEVICE_TYPE && devType != Constants::IOS_SIMULATOR_TYPE)
return false;
IDevice::ConstPtr dev = DeviceKitAspect::device(target()->kit());
IDevice::ConstPtr dev = DeviceKitAspect::device(kit());
if (dev.isNull() || dev->deviceState() != IDevice::DeviceReadyToUse)
return false;
@@ -153,8 +153,7 @@ bool IosRunConfiguration::isEnabled() const
QString IosRunConfiguration::applicationName() const
{
Project *project = target()->project();
if (ProjectNode *node = project->findNodeForBuildKey(buildKey()))
if (ProjectNode *node = project()->findNodeForBuildKey(buildKey()))
return node->data(Constants::IosTarget).toString();
return QString();
@@ -162,7 +161,7 @@ QString IosRunConfiguration::applicationName() const
FilePath IosRunConfiguration::bundleDirectory() const
{
Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(target()->kit());
Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(kit());
bool isDevice = (devType == Constants::IOS_DEVICE_TYPE);
if (!isDevice && devType != Constants::IOS_SIMULATOR_TYPE) {
qCWarning(iosLog) << "unexpected device type in bundleDirForTarget: " << devType.toString();
@@ -220,10 +219,10 @@ void IosDeviceTypeAspect::toMap(QVariantMap &map) const
QString IosRunConfiguration::disabledReason() const
{
Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(target()->kit());
Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(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());
IDevice::ConstPtr dev = DeviceKitAspect::device(kit());
QString validDevName;
bool hasConncetedDev = false;
if (devType == Constants::IOS_DEVICE_TYPE) {