Commit 44e905d0 authored by Pawel Polanski's avatar Pawel Polanski Committed by Leena Miettinen
Browse files

Symbian: SIS as a format must be uppercased

sis as an extension should be lowercased

Change-Id: I173e76005b6775fbd1180681d6b60b8a203cc04e
Reviewed-on: http://codereview.qt.nokia.com/709

Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarLeena Miettinen <riitta-leena.miettinen@nokia.com>
parent 97f4192f
...@@ -1229,7 +1229,7 @@ QVariantMap Version3Handler::update(Project *, const QVariantMap &map) ...@@ -1229,7 +1229,7 @@ QVariantMap Version3Handler::update(Project *, const QVariantMap &map)
QVariantMap buildConfig = targetIt.value().toMap(); QVariantMap buildConfig = targetIt.value().toMap();
int stepCount = buildConfig.value(QLatin1String("ProjectExplorer.BuildConfiguration.BuildStepsCount")).toInt(); int stepCount = buildConfig.value(QLatin1String("ProjectExplorer.BuildConfiguration.BuildStepsCount")).toInt();
QVariantMap signBuildStep; QVariantMap signBuildStep;
signBuildStep.insert(QLatin1String("ProjectExplorer.ProjectConfiguration.DisplayName"), QLatin1String("Create sis package")); signBuildStep.insert(QLatin1String("ProjectExplorer.ProjectConfiguration.DisplayName"), QLatin1String("Create SIS package"));
signBuildStep.insert(QLatin1String("ProjectExplorer.ProjectConfiguration.Id"), QLatin1String("Qt4ProjectManager.S60SignBuildStep")); signBuildStep.insert(QLatin1String("ProjectExplorer.ProjectConfiguration.Id"), QLatin1String("Qt4ProjectManager.S60SignBuildStep"));
signBuildStep.insert(QLatin1String("Qt4ProjectManager.MakeStep.Clean"), false); signBuildStep.insert(QLatin1String("Qt4ProjectManager.MakeStep.Clean"), false);
signBuildStep.insert(QLatin1String("Qt4ProjectManager.S60CreatePackageStep.Certificate"), customSignaturePath); signBuildStep.insert(QLatin1String("Qt4ProjectManager.S60CreatePackageStep.Certificate"), customSignaturePath);
......
...@@ -145,7 +145,7 @@ void S60PublisherOvi::completeCreation() ...@@ -145,7 +145,7 @@ void S60PublisherOvi::completeCreation()
m_reader->accept(profile, ProFileEvaluator::LoadProOnly); m_reader->accept(profile, ProFileEvaluator::LoadProOnly);
profile->deref(); profile->deref();
// set up process for creating the resulting sis files // set up process for creating the resulting SIS files
ProjectExplorer::AbstractProcessStep * makeStep = m_qt4bc->makeStep(); ProjectExplorer::AbstractProcessStep * makeStep = m_qt4bc->makeStep();
makeStep->init(); makeStep->init();
const ProjectExplorer::ProcessParameters * const makepp = makeStep->processParameters(); const ProjectExplorer::ProcessParameters * const makepp = makeStep->processParameters();
...@@ -192,7 +192,7 @@ void S60PublisherOvi::completeCreation() ...@@ -192,7 +192,7 @@ void S60PublisherOvi::completeCreation()
signArg = QLatin1String("installer_sis"); signArg = QLatin1String("installer_sis");
m_publishSteps.append(new S60CommandPublishStep(*m_qt4bc, m_publishSteps.append(new S60CommandPublishStep(*m_qt4bc,
makepp->effectiveCommand() + ' ' + signArg, makepp->effectiveCommand() + ' ' + signArg,
tr("Making sis file"))); tr("Making SIS file")));
// set up access to vendor names // set up access to vendor names
QStringList deploymentLevelVars = m_reader->values(QLatin1String("DEPLOYMENT")); QStringList deploymentLevelVars = m_reader->values(QLatin1String("DEPLOYMENT"));
...@@ -415,7 +415,7 @@ void S60PublisherOvi::printMessage(QString message, bool error) ...@@ -415,7 +415,7 @@ void S60PublisherOvi::printMessage(QString message, bool error)
void S60PublisherOvi::publishStepFinished(bool success) void S60PublisherOvi::publishStepFinished(bool success)
{ {
if (!success && m_publishSteps.at(0)->mandatory()) { if (!success && m_publishSteps.at(0)->mandatory()) {
emit progressReport(tr("Sis file not created due to previous errors.\n") , m_errorColor); emit progressReport(tr("SIS file not created due to previous errors.\n") , m_errorColor);
emit finished(); emit finished();
return; return;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment