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

Symbian: Fix create package parser

Browse Source 
Fix Parser to recognize errors in the form
(35) : error : Some message
This commit is contained in:
Tobias Hunger
2011-01-19 16:51:18 +01:00
parent 808408eeea
commit 522ffa1fa7
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.cpp
View File

@@ -46,7 +46,7 @@ S60CreatePackageParser::S60CreatePackageParser(const QString &packageName) :
m_needPassphrase(false)
{
setObjectName(QLatin1String("S60CreatePackageParser"));
m_signSis.setPattern("^\\s*(error\\s?:\\s?)+(.+)$");
m_signSis.setPattern("^(\\s*|\\(\\d+\\)\\s*:\\s*)(error\\s?:\\s?)+(.+)$");
m_signSis.setMinimal(true);
m_signSis.setCaseSensitivity(Qt::CaseInsensitive);
}
@@ -80,7 +80,7 @@ bool S60CreatePackageParser::parseLine(const QString &line)
}
if (m_signSis.indexIn(line) > -1) {
QString errorMessage(m_signSis.cap(2));
QString errorMessage(m_signSis.cap(3));
if (errorMessage.contains(QLatin1String("bad password"))
|| errorMessage.contains(QLatin1String("bad decrypt")))
m_needPassphrase = true;
@@ -131,4 +131,8 @@ NOTE: A patched package may not work as expected due to reduced capabilities and
Use a proper certificate to avoid the need to patch the package.
Processing untitled131_release-armv5.pkg...
and errors like:
(35) : error: Cannot find file : c:/QtSDK/Symbian/SDKs/Symbian3Qt471/epoc32/data/z/resource/apps/untitledSymbian.mif
*/