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

User is now informed in a proper way if the smartinstaller package is not found (SymbianOS)

Browse Source 
Task-number: QTCREATORBUG-3176
Reviewed-by: Tobias Hunger
This commit is contained in:
Pawel Polanski
2010-11-25 10:30:34 +01:00
parent bb6ba5652a
commit 6357afcbb3
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,9 @@
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/taskwindow.h> #include <projectexplorer/taskwindow.h>
#include <QDebug>
using namespace Qt4ProjectManager::Internal; using namespace Qt4ProjectManager::Internal;
S60CreatePackageParser::S60CreatePackageParser(const QString &packageName) : S60CreatePackageParser::S60CreatePackageParser(const QString &packageName) :
@@ -39,8 +42,9 @@ S60CreatePackageParser::S60CreatePackageParser(const QString &packageName) :
m_needPassphrase(false) m_needPassphrase(false)
{ {
setObjectName(QLatin1String("S60CreatePackageParser")); setObjectName(QLatin1String("S60CreatePackageParser"));
m_signSis.setPattern("^(error:\\s?)+(.+)$"); m_signSis.setPattern("^\\s*(error\\s?:\\s?)+(.+)$");
m_signSis.setMinimal(true); m_signSis.setMinimal(true);
m_signSis.setCaseSensitivity(Qt::CaseInsensitive);
} }
bool S60CreatePackageParser::parseLine(const QString &line) bool S60CreatePackageParser::parseLine(const QString &line)
@@ -72,11 +76,20 @@ bool S60CreatePackageParser::parseLine(const QString &line)
} }
if (m_signSis.indexIn(line) > -1) { if (m_signSis.indexIn(line) > -1) {
if (m_signSis.cap(2).contains(QLatin1String("bad password")) QString errorMessage(m_signSis.cap(2));
|| m_signSis.cap(2).contains(QLatin1String("bad decrypt"))) if (errorMessage.contains(QLatin1String("bad password"))
|| errorMessage.contains(QLatin1String("bad decrypt")))
m_needPassphrase = true; m_needPassphrase = true;
else if (errorMessage.contains(QLatin1String("Cannot open file"))
&& errorMessage.contains(QLatin1String("smartinstaller")))
emit addTask(ProjectExplorer::Task(ProjectExplorer::Task::Error,
tr("Cannot create Smart Installer package "
"as the Smart Installer's base file is missing. "
"Please ensure that it is located in the SDK."),
QString(), -1,
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
else else
emit addTask(ProjectExplorer::Task(ProjectExplorer::Task::Error, m_signSis.cap(2), QString(), -1, emit addTask(ProjectExplorer::Task(ProjectExplorer::Task::Error, errorMessage, QString(), -1,
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)); ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
return true; return true;
} }