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

Change-Id: I8e4155aa2a0a8c7f7405dd79e856380011e23a33

3 files changed, 9 insertions, 5 deletions

diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index f5ce84007e..000cc35399 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -617,8 +617,9 @@ QVector<AndroidDeviceInfo> AndroidConfig::connectedDevices(const FilePath &adbTo
     if (adbDevs.empty())
         return devices;
 
-    while (adbDevs.first().startsWith("* daemon"))
-        adbDevs.removeFirst(); // remove the daemon logs
+    for (const QString line : adbDevs) // remove the daemon logs
+        if (line.startsWith("* daemon"))
+            adbDevs.removeOne(line);
     adbDevs.removeFirst(); // remove "List of devices attached" header line
 
     // workaround for '????????????' serial numbers:
diff --git a/src/plugins/android/androidextralibrarylistmodel.cpp b/src/plugins/android/androidextralibrarylistmodel.cpp
index 58c6c2c8a7..3a168eca4a 100644
--- a/src/plugins/android/androidextralibrarylistmodel.cpp
+++ b/src/plugins/android/androidextralibrarylistmodel.cpp
@@ -87,7 +87,8 @@ void AndroidExtraLibraryListModel::updateModel()
     QTC_ASSERT(rc, return);
 
     const ProjectNode *node = m_target->project()->findNodeForBuildKey(rc->buildKey());
-    QTC_ASSERT(node, return);
+    if (!node)
+        return;
 
     if (node->parseInProgress()) {
         emit enabledChanged(false);
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;