aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@qt.io>2021-03-19 11:57:58 +0100
committerAndy Shaw <andy.shaw@qt.io>2021-03-20 09:29:27 +0000
commit7ec825be5ed2f3e837fdd6623e8188dc69663a76 (patch)
treedad1d903034eb11d43bc46cb1a98f8cd3385de07
parentc34b9502275d0d1d5b88d7a63bff076e2a164836 (diff)
Android: Ignore an error when doing an incremental build4.14
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 <assam.boudjelthia@qt.io>
-rw-r--r--src/plugins/android/androiddeployqtstep.cpp2
1 files changed, 1 insertions, 1 deletions
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));
}