From 7ec825be5ed2f3e837fdd6623e8188dc69663a76 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Fri, 19 Mar 2021 11:57:58 +0100 Subject: Android: Ignore an error when doing an incremental build Since this is not really an error but it is outputted to stderr, we need to explicitly ignore it so it does not show an error dialog. Change-Id: Ia972cf134278216c317649b5483e3deac683374d Reviewed-by: Assam Boudjelthia --- src/plugins/android/androiddeployqtstep.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 9a4e6b5ae9..d2adfb8944 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -562,7 +562,7 @@ void AndroidDeployQtStep::stdError(const QString &line) if (newOutput.startsWith("warning", Qt::CaseInsensitive) || newOutput.startsWith("note", Qt::CaseInsensitive)) TaskHub::addTask(DeploymentTask(Task::Warning, newOutput)); - else + else if (newOutput != QLatin1String("All files should be loaded. Notifying the device.")) TaskHub::addTask(DeploymentTask(Task::Error, newOutput)); } -- cgit v1.2.1