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

Merge remote-tracking branch 'origin/7.0'

Browse Source 
Conflicts:
	src/plugins/android/androiddevice.cpp
	src/plugins/docker/dockerdevice.cpp

Change-Id: Id16ba0d9993c9f608242622aceae0a2a6691e05e
This commit is contained in:
Eike Ziller
2022-03-17 08:48:28 +01:00
parent 68faedd62f 976653cd93
commit 9fd2a059f6
47 changed files with 727 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);