diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2020-05-27 18:59:53 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2020-05-27 18:59:53 +0200 |
| commit | b193892fd1289bd8a995cd609ead33f925b75ee1 (patch) | |
| tree | 4d03bf8ea45a9ab542eb6ab129e56a82b860e19c /src/plugins/android/androidconfigurations.cpp | |
| parent | aa79d30b83fc79e8e18af4da0062ddf21fcd201f (diff) | |
| parent | 13ad8163080153cb5d1ea39238069b5cca8f9651 (diff) | |
Merge remote-tracking branch 'origin/4.12' into qds-1.50qds-1.50
Change-Id: I8e4155aa2a0a8c7f7405dd79e856380011e23a33
Diffstat (limited to 'src/plugins/android/androidconfigurations.cpp')
| -rw-r--r-- | src/plugins/android/androidconfigurations.cpp | 5 |
1 files changed, 3 insertions, 2 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: |