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/android/androiddevice.cpp
View File

@@ -53,6 +53,8 @@ AndroidDevice::AndroidDevice()
"Run on Android"));
setDisplayType(QCoreApplication::translate("Android::Internal::AndroidDevice", "Android"));
setMachineType(IDevice::Hardware);
setOsType(Utils::OsTypeOtherUnix);
setDeviceState(DeviceReadyToUse);
QString activityPath;
const AndroidConfig &config = AndroidConfigurations::currentConfig();
@@ -82,11 +84,6 @@ DeviceProcessSignalOperation::Ptr AndroidDevice::signalOperation() const
return DeviceProcessSignalOperation::Ptr(new AndroidSignalOperation());
}
Utils::OsType AndroidDevice::osType() const
{
return Utils::OsTypeOtherUnix;
}
QUrl AndroidDevice::toolControlChannel(const ControlChannelHint &) const
{
QUrl url;