Merge remote-tracking branch 'origin/4.12' into qds-1.50qds-1.50

Change-Id: I8e4155aa2a0a8c7f7405dd79e856380011e23a33

1 files changed, 4 insertions, 2 deletions

diff --git a/src/plugins/android/androidtoolmanager.cpp b/src/plugins/android/androidtoolmanager.cpp
index 22c40dfef9..fa88a4987f 100644
--- a/src/plugins/android/androidtoolmanager.cpp
+++ b/src/plugins/android/androidtoolmanager.cpp
@@ -206,8 +206,10 @@ AndroidDeviceInfoList AndroidToolManager::androidVirtualDevices(const Utils::Fil
     if (avds.empty())
         return devices;
 
-    while (avds.first().startsWith(QLatin1String("* daemon")))
-        avds.removeFirst(); // remove the daemon logs
+    for (const QString line : avds) // remove the daemon logs
+        if (line.startsWith("* daemon"))
+            avds.removeOne(line);
+
     avds.removeFirst(); // remove "List of devices attached" header line
 
     bool nextLineIsTargetLine = false;