diff options
author | Eike Ziller <[email protected]> | 2022-03-17 08:48:28 +0100 |
---|---|---|
committer | Eike Ziller <[email protected]> | 2022-03-17 08:48:28 +0100 |
commit | 9fd2a059f61dcdfd48011ab45f9b5cd20b5addd0 (patch) | |
tree | 98509c4713ee534908a2c7551e87fcff5bc50025 /src/plugins/android/androiddevice.cpp | |
parent | 68faedd62fcac74206f412cbd24b8881fd6373f7 (diff) | |
parent | 976653cd9382ce0d7fac35b6c2f5b51feba7cd1c (diff) |
Merge remote-tracking branch 'origin/7.0'
Conflicts:
src/plugins/android/androiddevice.cpp
src/plugins/docker/dockerdevice.cpp
Change-Id: Id16ba0d9993c9f608242622aceae0a2a6691e05e
Diffstat (limited to 'src/plugins/android/androiddevice.cpp')
-rw-r--r-- | src/plugins/android/androiddevice.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp index 3c2d4fd5d1a..8609fc7a89f 100644 --- a/src/plugins/android/androiddevice.cpp +++ b/src/plugins/android/androiddevice.cpp @@ -624,7 +624,7 @@ void AndroidDeviceManager::HandleAvdsListChange() } QVector<Id> connectedDevs; - for (auto item : m_avdsFutureWatcher.result()) { + for (const AndroidDeviceInfo &item : m_avdsFutureWatcher.result()) { const Utils::Id deviceId = AndroidDevice::idFromDeviceInfo(item); const QString displayName = AndroidDevice::displayNameFromInfo(item); IDevice::ConstPtr dev = devMgr->find(deviceId); |