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

ProjectExplorer: Make Device::displayType a data member

Browse Source 
Change-Id: If650f660e3b10bc28d575ded07a854f59be26f87
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-06-19 13:28:14 +02:00
parent e2d6c0bfea
commit f420788465
21 changed files with 31 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androiddevice.cpp
View File

@@ -50,6 +50,7 @@ AndroidDevice::AndroidDevice()
setupId(IDevice::AutoDetected, Constants::ANDROID_DEVICE_ID);
setType(Constants::ANDROID_DEVICE_TYPE);
setDisplayName(QCoreApplication::translate("Android::Internal::AndroidDevice", "Run on Android"));
setDisplayType(QCoreApplication::translate("Android::Internal::AndroidDevice", "Android"));
setMachineType(IDevice::Hardware);
setDeviceState(DeviceReadyToUse);
QString activityPath;
@@ -65,11 +66,6 @@ IDevice::DeviceInfo AndroidDevice::deviceInformation() const
return IDevice::DeviceInfo();
}
QString AndroidDevice::displayType() const
{
return QCoreApplication::translate("Android::Internal::AndroidDevice", "Android");
}
IDeviceWidget *AndroidDevice::createWidget()
{
return nullptr;