feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Small improvements to the abld parser

Browse Source 
* Should work better with errors that can happen during deployment
This commit is contained in:
Tobias Hunger
2010-07-07 16:42:41 +02:00
parent 5956db6f98
commit 3d2e566772
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qt4projectmanager/qt-s60/abldparser.cpp
View File

@@ -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;