From 6f17ad056284b57cd1c76abcc03ecd22fb5a86ba Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Mon, 23 Nov 2020 15:53:19 +0200 Subject: [PATCH] Android: avoid QTC_ASSERT in addTask Change-Id: I0b3eee749f21a031ff7b7f910b07719b03585759 Reviewed-by: Alessandro Portale --- src/plugins/android/androidbuildapkstep.cpp | 3 +++ src/plugins/android/androiddeployqtstep.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp index 38d68415251..2d9536d9167 100644 --- a/src/plugins/android/androidbuildapkstep.cpp +++ b/src/plugins/android/androidbuildapkstep.cpp @@ -899,6 +899,9 @@ void AndroidBuildApkStep::stdError(const QString &output) QString newOutput = output; newOutput.remove(QRegularExpression("^(\\n)+")); + if (newOutput.isEmpty()) + return; + if (newOutput.startsWith("warning", Qt::CaseInsensitive) || newOutput.startsWith("note", Qt::CaseInsensitive)) TaskHub::addTask(BuildSystemTask(Task::Warning, newOutput)); diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 19990e149ee..9a4e6b5ae9b 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -556,6 +556,9 @@ void AndroidDeployQtStep::stdError(const QString &line) QString newOutput = line; newOutput.remove(QRegularExpression("^(\\n)+")); + if (newOutput.isEmpty()) + return; + if (newOutput.startsWith("warning", Qt::CaseInsensitive) || newOutput.startsWith("note", Qt::CaseInsensitive)) TaskHub::addTask(DeploymentTask(Task::Warning, newOutput));