Capabilities and IMEIs can now be extracted form Dev Certs for SymbianOS

Reviewed-by: Alessandro Portale
This commit is contained in:
Pawel Polanski
2010-12-13 17:17:41 +01:00
parent df43d55e04
commit 993771f04c
5 changed files with 475 additions and 36 deletions

View File

@@ -469,20 +469,20 @@ bool S60CreatePackageStep::validateCustomSigningResources()
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
return false;
}
S60CertificateInfo::CertificateState certState = S60CertificateInfo::validateCertificate(customSignaturePath(), &errorString);
QScopedPointer<S60CertificateInfo> certInfoPtr(new S60CertificateInfo(customSignaturePath()));
S60CertificateInfo::CertificateState certState = certInfoPtr.data()->validateCertificate();
switch (certState) {
case S60CertificateInfo::CertificateError:
emit addOutput(errorString, BuildStep::ErrorMessageOutput);
emit addOutput(certInfoPtr.data()->errorString(), BuildStep::ErrorMessageOutput);
emit addTask(ProjectExplorer::Task(ProjectExplorer::Task::Error,
errorString,
certInfoPtr.data()->errorString(),
QString(), -1,
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
return false;
case S60CertificateInfo::CertificateWarning:
emit addOutput(errorString, BuildStep::MessageOutput);
emit addOutput(certInfoPtr.data()->errorString(), BuildStep::MessageOutput);
emit addTask(ProjectExplorer::Task(ProjectExplorer::Task::Warning,
errorString,
certInfoPtr.data()->errorString(),
QString(), -1,
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
break;