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

Added support for not signing packages for Symbian OS

Browse Source 
Reviewed-by: Tobias Hunger
This commit is contained in:
Pawel Polanski
2010-09-30 13:43:01 +02:00
parent cb99adfb0d
commit 67ff313ceb
5 changed files with 104 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp
View File

@@ -147,13 +147,20 @@ QStringList S60DeployConfiguration::signedPackages() const
continue;
TargetInformation ti = node->targetInformation();
if (ti.valid)
result << ti.buildDir + QLatin1Char('/') + ti.target
+ (runSmartInstaller() ? QLatin1String("_installer") : QLatin1String(""))
+ QLatin1String(".sis");
result << ti.buildDir + QLatin1Char('/') + createPackageName(ti.target);
}
return result;
}
QString S60DeployConfiguration::createPackageName(const QString &baseName) const
{
QString name(baseName);
name += isSigned() ? QLatin1String("") : QLatin1String("_unsigned");
name += runSmartInstaller() ? QLatin1String("_installer") : QLatin1String("");
name += QLatin1String(".sis");
return name;
}
QStringList S60DeployConfiguration::packageFileNamesWithTargetInfo() const
{
QList<Qt4ProFileNode *> leafs = qt4Target()->qt4Project()->leafProFiles();
@@ -216,6 +223,21 @@ bool S60DeployConfiguration::runSmartInstaller() const
return false;
}
bool S60DeployConfiguration::isSigned() const
{
DeployConfiguration *dc = target()->activeDeployConfiguration();
QTC_ASSERT(dc, return false);
BuildStepList *bsl = dc->stepList();
QTC_ASSERT(bsl, return false);
QList<BuildStep *> steps = bsl->steps();
foreach (const BuildStep *step, steps) {
if (const S60CreatePackageStep *packageStep = qobject_cast<const S60CreatePackageStep *>(step)) {
return packageStep->signingMode() != S60CreatePackageStep::NotSigned;
}
}
return false;
}
ProjectExplorer::ToolChain::ToolChainType S60DeployConfiguration::toolChainType() const
{
if (Qt4BuildConfiguration *bc = qobject_cast<Qt4BuildConfiguration *>(target()->activeBuildConfiguration()))