From c7061af61f5c59c9fa3a8e8672f50a690416d9ac Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 31 Aug 2021 12:59:26 +0300 Subject: [PATCH] Android: don't throw error on adb's "All files should be loaded." log 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 --- src/plugins/android/androiddeployqtstep.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 4adfeea8d4e..7955677111d 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -544,10 +544,12 @@ void AndroidDeployQtStep::stdError(const QString &line) return; 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)); - else if (newOutput != QLatin1String("All files should be loaded. Notifying the device.")) + } else { TaskHub::addTask(DeploymentTask(Task::Error, newOutput)); + } } AndroidDeployQtStep::DeployErrorCode AndroidDeployQtStep::parseDeployErrors(