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

Merge remote-tracking branch 'origin/4.12'

Browse Source 
Conflicts:
	src/plugins/android/androidextralibrarylistmodel.cpp

Change-Id: Ica69c24e83deff819e640dcb4c2682a554d8a2d2
This commit is contained in:
Eike Ziller
2020-05-19 15:23:16 +02:00
parent 08734e2ea0 cad625c739
commit 8292807e0d
20 changed files with 59 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/android/androidconfigurations.cpp
View File

@@ -616,8 +616,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:

3
src/plugins/android/androidextralibrarylistmodel.cpp
View File

@@ -90,7 +90,8 @@ void AndroidExtraLibraryListModel::updateModel()
{
const QString buildKey = m_buildSystem->target()->activeBuildKey();
const ProjectNode *node = m_buildSystem->target()->project()->findNodeForBuildKey(buildKey);
QTC_ASSERT(node, return);
if (!node)
return;
if (node->parseInProgress()) {
emit enabledChanged(false);

6
src/plugins/android/androidtoolmanager.cpp
View File

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