From 2eb97dcb4b77f7a77ca1c63947b558977ae65a11 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Wed, 7 Jul 2010 16:42:41 +0200
Subject: [PATCH] Small improvements to the abld parser
* Should work better with errors that can happen during deployment
(cherry picked from commit 3d2e566772ef3686d9dbe5910ca2e006c96812cc)
---
src/plugins/qt4projectmanager/qt-s60/abldparser.cpp | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qt4projectmanager/qt-s60/abldparser.cpp b/src/plugins/qt4projectmanager/qt-s60/abldparser.cpp
index 692d7b30e83..47e637208f7 100644
--- a/src/plugins/qt4projectmanager/qt-s60/abldparser.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/abldparser.cpp
@@ -62,7 +62,8 @@ void AbldParser::stdOutput(const QString &line)
TASK_CATEGORY_BUILDSYSTEM));
return;
}
- if (lne.startsWith(QLatin1String("FATAL ERROR:"))) {
+ if (lne.startsWith(QLatin1String("FATAL ERROR:")) ||
+ lne.startsWith(QLatin1String("Error :"))) {
emit addTask(Task(Task::Error,
lne /* description */,
QString() /* filename */,
@@ -91,6 +92,14 @@ void AbldParser::stdOutput(const QString &line)
return;
}
+ if (lne.startsWith(QLatin1String("SIS creation failed!"))) {
+ m_waitingForStdOutContinuation = false;
+ emit addTask(Task(Task::Error,
+ line, QString(), -1,
+ TASK_CATEGORY_BUILDSYSTEM));
+ return;
+ }
+
if (lne.isEmpty()) {
m_waitingForStdOutContinuation = false;
return;
--
GitLab