Commit 8ea7389c authored by Pawel Polanski's avatar Pawel Polanski
Browse files

Static libraries are not listed in the sis package list. Symbian OS

Revised-by: Tobias Hunger
parent ee4f4003
......@@ -128,25 +128,23 @@ ProjectExplorer::DeployConfigurationWidget *S60DeployConfiguration::configuratio
return new S60DeployConfigurationWidget();
}
QStringList S60DeployConfiguration::signedPackages() const
bool S60DeployConfiguration::isStaticLibrary(const Qt4ProFileNode &projectNode) const
{
QList<Qt4ProFileNode *> list = qt4Target()->qt4Project()->leafProFiles();
QStringList result;
foreach (Qt4ProFileNode *node, list) {
TargetInformation ti = node->targetInformation();
if (ti.valid)
result << ti.buildDir + QLatin1Char('/') + ti.target
+ (runSmartInstaller() ? QLatin1String("_installer") : QLatin1String(""))
+ QLatin1String(".sis");
if (projectNode.projectType() == LibraryTemplate) {
const QStringList &config(projectNode.variableValue(ConfigVar));
if (config.contains(QLatin1String("static")) || config.contains(QLatin1String("staticlib")))
return true;
}
return result;
return false;
}
QStringList S60DeployConfiguration::appSignedPackages() const
QStringList S60DeployConfiguration::signedPackages() const
{
QList<Qt4ProFileNode *> list = qt4Target()->qt4Project()->leafProFiles();
QStringList result;
foreach (Qt4ProFileNode *node, list) {
if (isStaticLibrary(*node)) //no sis package
continue;
TargetInformation ti = node->targetInformation();
if (ti.valid)
result << ti.buildDir + QLatin1Char('/') + ti.target
......@@ -161,6 +159,8 @@ QStringList S60DeployConfiguration::packageFileNamesWithTargetInfo() const
QList<Qt4ProFileNode *> leafs = qt4Target()->qt4Project()->leafProFiles();
QStringList result;
foreach (Qt4ProFileNode *qt4ProFileNode, leafs) {
if (isStaticLibrary(*qt4ProFileNode)) //no sis package
continue;
TargetInformation ti = qt4ProFileNode->targetInformation();
if (!ti.valid)
continue;
......@@ -178,6 +178,8 @@ QStringList S60DeployConfiguration::packageTemplateFileNames() const
QList<Qt4ProFileNode *> list = qt4Target()->qt4Project()->leafProFiles();
QStringList result;
foreach (Qt4ProFileNode *node, list) {
if (isStaticLibrary(*node)) //no sis package
continue;
TargetInformation ti = node->targetInformation();
if (ti.valid)
result << ti.buildDir + QLatin1Char('/') + ti.target + QLatin1String("_template.pkg");
......@@ -190,6 +192,8 @@ QStringList S60DeployConfiguration::appPackageTemplateFileNames() const
QList<Qt4ProFileNode *> list = qt4Target()->qt4Project()->leafProFiles();
QStringList result;
foreach (Qt4ProFileNode *node, list) {
if (isStaticLibrary(*node)) //no sis package
continue;
TargetInformation ti = node->targetInformation();
if (ti.valid)
result << ti.buildDir + QLatin1Char('/') + ti.target + QLatin1String("_template.pkg");
......
......@@ -71,7 +71,6 @@ public:
void setSilentInstall(bool silent);
QStringList signedPackages() const;
QStringList appSignedPackages() const;
QStringList packageFileNamesWithTargetInfo() const;
QStringList packageTemplateFileNames() const;
QStringList appPackageTemplateFileNames() const;
......@@ -97,6 +96,7 @@ private:
QString symbianPlatform() const;
QString symbianTarget() const;
bool isDebug() const;
bool isStaticLibrary(const Qt4ProFileNode &projectNode) const;
private:
ProjectExplorer::BuildConfiguration *m_activeBuildConfiguration;
......
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