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

ProjectExplorer: Base IDevice::osType on a data member

Browse Source 
Change-Id: I969563e6e62895a51fb4692c8eb0bab278f0ecae
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-08-16 10:17:45 +02:00
parent b6618ab632
commit 36d98d4af7
21 changed files with 32 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/ios/iosdevice.cpp
View File

@@ -86,6 +86,7 @@ IosDevice::IosDevice()
setDefaultDisplayName(IosDevice::name());
setDisplayType(QCoreApplication::translate("Ios::Internal::IosDevice", "iOS"));
setMachineType(IDevice::Hardware);
setOsType(Utils::OsTypeMac);
setDeviceState(DeviceDisconnected);
Utils::PortList ports;
ports.addRange(Utils::Port(Constants::IOS_DEVICE_PORT_START),
@@ -101,6 +102,7 @@ IosDevice::IosDevice(const QString &uid)
setDefaultDisplayName(IosDevice::name());
setDisplayType(QCoreApplication::translate("Ios::Internal::IosDevice", "iOS"));
setMachineType(IDevice::Hardware);
setOsType(Utils::OsTypeMac);
setDeviceState(DeviceDisconnected);
}
@@ -174,11 +176,6 @@ bool IosDevice::canAutoDetectPorts() const
return true;
}
Utils::OsType IosDevice::osType() const
{
return Utils::OsTypeMac;
}
// IosDeviceManager

1
src/plugins/ios/iosdevice.h
View File

@@ -59,7 +59,6 @@ public:
QString osVersion() const;
Utils::Port nextPort() const;
bool canAutoDetectPorts() const override;
Utils::OsType osType() const override;
static QString name();

6
src/plugins/ios/iossimulator.cpp
View File

@@ -50,6 +50,7 @@ IosSimulator::IosSimulator(Core::Id id)
setupId(IDevice::AutoDetected, id);
setType(Constants::IOS_SIMULATOR_TYPE);
setMachineType(IDevice::Emulator);
setOsType(Utils::OsTypeMac);
setDefaultDisplayName(QCoreApplication::translate("Ios::Internal::IosSimulator",
"iOS Simulator"));
setDisplayType(QCoreApplication::translate("Ios::Internal::IosSimulator", "iOS Simulator"));
@@ -102,11 +103,6 @@ bool IosSimulator::canAutoDetectPorts() const
return true;
}
Utils::OsType IosSimulator::osType() const
{
return Utils::OsTypeMac;
}
// IosDeviceType
IosDeviceType::IosDeviceType(IosDeviceType::Type type, const QString &identifier, const QString &displayName) :

1
src/plugins/ios/iossimulator.h
View File

@@ -73,7 +73,6 @@ public:
ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const override;
Utils::Port nextPort() const;
bool canAutoDetectPorts() const override;
Utils::OsType osType() const override;
protected:
friend class IosSimulatorFactory;