diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-11-23 15:53:19 +0200 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-11-26 19:03:01 +0000 |
| commit | 6f17ad056284b57cd1c76abcc03ecd22fb5a86ba (patch) | |
| tree | 18b8af43bd3fc5fe915fd37cc94dc2b8a85b2f7d | |
| parent | 2d05822e27df3daf889e197d438cdfb15b734741 (diff) | |
Android: avoid QTC_ASSERT in addTask
Change-Id: I0b3eee749f21a031ff7b7f910b07719b03585759
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| -rw-r--r-- | src/plugins/android/androidbuildapkstep.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/android/androiddeployqtstep.cpp | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp index 38d6841525..2d9536d916 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 19990e149e..9a4e6b5ae9 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)); |