diff options
| author | hjk <hjk@qt.io> | 2019-08-16 10:17:45 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-08-19 07:44:45 +0000 |
| commit | 36d98d4af75414ef1c6fb876d8fd5b59bbe2f54b (patch) | |
| tree | a9f4763affa0ca96ccef533e51c23dd1e23ad20f /src/plugins/android | |
| parent | b6618ab6322d5d62b47c57aa86c32ef4be4734bb (diff) | |
| download | qt-creator-36d98d4af75414ef1c6fb876d8fd5b59bbe2f54b.tar.gz | |
ProjectExplorer: Base IDevice::osType on a data member
Change-Id: I969563e6e62895a51fb4692c8eb0bab278f0ecae
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/android')
| -rw-r--r-- | src/plugins/android/androiddevice.cpp | 7 | ||||
| -rw-r--r-- | src/plugins/android/androiddevice.h | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp index ee79fd4f6a..9b9e4d9c13 100644 --- a/src/plugins/android/androiddevice.cpp +++ b/src/plugins/android/androiddevice.cpp @@ -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; diff --git a/src/plugins/android/androiddevice.h b/src/plugins/android/androiddevice.h index 37ed1b5612..33ea84cf50 100644 --- a/src/plugins/android/androiddevice.h +++ b/src/plugins/android/androiddevice.h @@ -34,7 +34,7 @@ namespace Internal { class AndroidDevice : public ProjectExplorer::IDevice { public: - static IDevice::Ptr create() { return IDevice::Ptr(new AndroidDevice); }; + static IDevice::Ptr create() { return IDevice::Ptr(new AndroidDevice); } private: AndroidDevice(); @@ -44,7 +44,6 @@ private: ProjectExplorer::IDeviceWidget *createWidget() override; bool canAutoDetectPorts() const override; ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const override; - Utils::OsType osType() const override; QUrl toolControlChannel(const ControlChannelHint &) const override; }; |