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

Android: don't throw error on adb's "All files should be loaded." log

Browse Source 
When installing a signed apk, adb might throw the following log
"All files should be loaded. Notifying the device." which is being
treated as an error and will stop the deployment from going forward
until user input is given. The current condition is not catching it
probably because it has a \n at the end, but let's treat it as a
warning.

Change-Id: If071730b39871b4e60f8755d14ba352b86e7c244
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Assam Boudjelthia
2021-08-31 12:59:26 +03:00
parent bf3dae64a2
commit c7061af61f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -544,10 +544,12 @@ void AndroidDeployQtStep::stdError(const QString &line)
return; return;
if (newOutput.startsWith("warning", Qt::CaseInsensitive) if (newOutput.startsWith("warning", Qt::CaseInsensitive)
|| newOutput.startsWith("note", Qt::CaseInsensitive)) || newOutput.startsWith("note", Qt::CaseInsensitive)
|| newOutput.startsWith(QLatin1String("All files should be loaded."))) {
TaskHub::addTask(DeploymentTask(Task::Warning, newOutput)); TaskHub::addTask(DeploymentTask(Task::Warning, newOutput));
else if (newOutput != QLatin1String("All files should be loaded. Notifying the device.")) } else {
TaskHub::addTask(DeploymentTask(Task::Error, newOutput)); TaskHub::addTask(DeploymentTask(Task::Error, newOutput));
}
} }
AndroidDeployQtStep::DeployErrorCode AndroidDeployQtStep::parseDeployErrors( AndroidDeployQtStep::DeployErrorCode AndroidDeployQtStep::parseDeployErrors(